diff config/initializers/.svn/all-wcprops @ 120:cd2282d2aa55 cannam

Merge from the default branch.  Note that this is not a valid SVN repository any more (use default, redmine-1.1 etc for SVN updates).

--- a/config/initializers/.svn/all-wcprops	Thu Jan 13 13:21:03 2011 +0000
+++ b/config/initializers/.svn/all-wcprops	Thu Jan 13 14:33:08 2011 +0000
@@ -1,11 +1,47 @@
+K 25
+svn:wc:ra_dav:version-url
+V 44
+/svn/!svn/ver/4679/trunk/config/initializers
+END
+inflections.rb
+K 25
+svn:wc:ra_dav:version-url
+V 59
+/svn/!svn/ver/2895/trunk/config/initializers/inflections.rb
+END
+30-redmine.rb
 K 25
 svn:wc:ra_dav:version-url
 V 58
-/svn/!svn/ver/4585/branches/1.1-stable/config/initializers
+/svn/!svn/ver/4679/trunk/config/initializers/30-redmine.rb
 END
 10-patches.rb
 K 25
 svn:wc:ra_dav:version-url
-V 72
-/svn/!svn/ver/4585/branches/1.1-stable/config/initializers/10-patches.rb
+V 58
+/svn/!svn/ver/4516/trunk/config/initializers/10-patches.rb
 END
+backtrace_silencers.rb
+K 25
+svn:wc:ra_dav:version-url
+V 67
+/svn/!svn/ver/2895/trunk/config/initializers/backtrace_silencers.rb
+END
+40-email.rb
+K 25
+svn:wc:ra_dav:version-url
+V 56
+/svn/!svn/ver/1625/trunk/config/initializers/40-email.rb
+END
+20-mime_types.rb
+K 25
+svn:wc:ra_dav:version-url
+V 61
+/svn/!svn/ver/1797/trunk/config/initializers/20-mime_types.rb
+END
+bigdecimal-segfault-fix.rb
+K 25
+svn:wc:ra_dav:version-url
+V 71
+/svn/!svn/ver/2895/trunk/config/initializers/bigdecimal-segfault-fix.rb
+END