diff app/views/settings/.svn/all-wcprops @ 442:753f1380d6bc cannam

Merge from branch "redmine-1.2"
author Chris Cannam
date Mon, 06 Jun 2011 14:41:04 +0100
parents eeebe205a056 cbce1fd3b1b7
children
line wrap: on
line diff
--- a/app/views/settings/.svn/all-wcprops	Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/settings/.svn/all-wcprops	Mon Jun 06 14:41:04 2011 +0100
@@ -1,65 +1,5 @@
-K 25
-svn:wc:ra_dav:version-url
-V 43
-/svn/!svn/ver/4983/trunk/app/views/settings
-END
-_issues.rhtml
 K 25
 svn:wc:ra_dav:version-url
 V 57
-/svn/!svn/ver/4513/trunk/app/views/settings/_issues.rhtml
+/svn/!svn/ver/5961/branches/1.2-stable/app/views/settings
 END
-_general.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 58
-/svn/!svn/ver/4426/trunk/app/views/settings/_general.rhtml
-END
-_authentication.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 65
-/svn/!svn/ver/4306/trunk/app/views/settings/_authentication.rhtml
-END
-_mail_handler.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 63
-/svn/!svn/ver/3226/trunk/app/views/settings/_mail_handler.rhtml
-END
-plugin.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 55
-/svn/!svn/ver/837/trunk/app/views/settings/plugin.rhtml
-END
-_display.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 58
-/svn/!svn/ver/4811/trunk/app/views/settings/_display.rhtml
-END
-edit.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 54
-/svn/!svn/ver/2871/trunk/app/views/settings/edit.rhtml
-END
-_repositories.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 63
-/svn/!svn/ver/4983/trunk/app/views/settings/_repositories.rhtml
-END
-_notifications.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 64
-/svn/!svn/ver/4730/trunk/app/views/settings/_notifications.rhtml
-END
-_projects.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 59
-/svn/!svn/ver/3198/trunk/app/views/settings/_projects.rhtml
-END