diff config/.svn/all-wcprops @ 442:753f1380d6bc cannam

Merge from branch "redmine-1.2"

--- a/config/.svn/all-wcprops	Thu Mar 03 15:08:45 2011 +0000
+++ b/config/.svn/all-wcprops	Mon Jun 06 14:41:04 2011 +0100
@@ -1,47 +1,17 @@
 K 25
 svn:wc:ra_dav:version-url
-V 31
-/svn/!svn/ver/4955/trunk/config
-END
-settings.yml
-K 25
-svn:wc:ra_dav:version-url
-V 44
-/svn/!svn/ver/4513/trunk/config/settings.yml
-END
-configuration.yml.example
-K 25
-svn:wc:ra_dav:version-url
-V 57
-/svn/!svn/ver/4950/trunk/config/configuration.yml.example
+V 45
+/svn/!svn/ver/5998/branches/1.2-stable/config
 END
 routes.rb
 K 25
 svn:wc:ra_dav:version-url
-V 41
-/svn/!svn/ver/4729/trunk/config/routes.rb
-END
-boot.rb
-K 25
-svn:wc:ra_dav:version-url
-V 39
-/svn/!svn/ver/4516/trunk/config/boot.rb
+V 55
+/svn/!svn/ver/5878/branches/1.2-stable/config/routes.rb
 END
 environment.rb
 K 25
 svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4904/trunk/config/environment.rb
+V 60
+/svn/!svn/ver/5878/branches/1.2-stable/config/environment.rb
 END
-additional_environment.rb.example
-K 25
-svn:wc:ra_dav:version-url
-V 65
-/svn/!svn/ver/3018/trunk/config/additional_environment.rb.example
-END
-database.yml.example
-K 25
-svn:wc:ra_dav:version-url
-V 52
-/svn/!svn/ver/4753/trunk/config/database.yml.example
-END