Mercurial > hg > soundsoftware-site
diff test/.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 | 851510f1b535 |
line wrap: on
line diff
--- a/test/.svn/all-wcprops Thu Mar 03 15:08:45 2011 +0000 +++ b/test/.svn/all-wcprops Mon Jun 06 14:41:04 2011 +0100 @@ -1,23 +1,5 @@ K 25 svn:wc:ra_dav:version-url -V 29 -/svn/!svn/ver/4991/trunk/test +V 43 +/svn/!svn/ver/5947/branches/1.2-stable/test END -object_daddy_helpers.rb -K 25 -svn:wc:ra_dav:version-url -V 53 -/svn/!svn/ver/4078/trunk/test/object_daddy_helpers.rb -END -test_helper.rb -K 25 -svn:wc:ra_dav:version-url -V 44 -/svn/!svn/ver/4603/trunk/test/test_helper.rb -END -helper_testcase.rb -K 25 -svn:wc:ra_dav:version-url -V 48 -/svn/!svn/ver/2887/trunk/test/helper_testcase.rb -END