diff lib/.svn/all-wcprops @ 514:7eba09d624db live

Merge

--- a/lib/.svn/all-wcprops	Thu Jul 14 10:46:20 2011 +0100
+++ b/lib/.svn/all-wcprops	Thu Jul 14 10:50:53 2011 +0100
@@ -1,41 +1,17 @@
-K 25
-svn:wc:ra_dav:version-url
-V 28
-/svn/!svn/ver/4406/trunk/lib
-END
-faster_csv.rb
 K 25
 svn:wc:ra_dav:version-url
 V 42
-/svn/!svn/ver/3007/trunk/lib/faster_csv.rb
+/svn/!svn/ver/6261/branches/1.2-stable/lib
 END
 redmine.rb
 K 25
 svn:wc:ra_dav:version-url
-V 39
-/svn/!svn/ver/4388/trunk/lib/redmine.rb
-END
-tabular_form_builder.rb
-K 25
-svn:wc:ra_dav:version-url
-V 52
-/svn/!svn/ver/3804/trunk/lib/tabular_form_builder.rb
+V 53
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine.rb
 END
 redcloth3.rb
 K 25
 svn:wc:ra_dav:version-url
-V 41
-/svn/!svn/ver/4374/trunk/lib/redcloth3.rb
+V 55
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redcloth3.rb
 END
-ar_condition.rb
-K 25
-svn:wc:ra_dav:version-url
-V 44
-/svn/!svn/ver/1227/trunk/lib/ar_condition.rb
-END
-diff.rb
-K 25
-svn:wc:ra_dav:version-url
-V 36
-/svn/!svn/ver/2840/trunk/lib/diff.rb
-END