Mercurial > hg > soundsoftware-site
diff lib/redmine/views/.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).
author | Chris Cannam |
---|---|
date | Thu, 13 Jan 2011 14:33:08 +0000 |
parents | af80e5618e9b 8661b858af72 |
children |
line wrap: on
line diff
--- a/lib/redmine/views/.svn/all-wcprops Thu Jan 13 13:21:03 2011 +0000 +++ b/lib/redmine/views/.svn/all-wcprops Thu Jan 13 14:33:08 2011 +0000 @@ -1,17 +1,23 @@ K 25 svn:wc:ra_dav:version-url -V 56 -/svn/!svn/ver/4585/branches/1.1-stable/lib/redmine/views +V 42 +/svn/!svn/ver/4489/trunk/lib/redmine/views END api_template_handler.rb K 25 svn:wc:ra_dav:version-url -V 80 -/svn/!svn/ver/4585/branches/1.1-stable/lib/redmine/views/api_template_handler.rb +V 66 +/svn/!svn/ver/4452/trunk/lib/redmine/views/api_template_handler.rb +END +other_formats_builder.rb +K 25 +svn:wc:ra_dav:version-url +V 67 +/svn/!svn/ver/2334/trunk/lib/redmine/views/other_formats_builder.rb END builders.rb K 25 svn:wc:ra_dav:version-url -V 68 -/svn/!svn/ver/4585/branches/1.1-stable/lib/redmine/views/builders.rb +V 54 +/svn/!svn/ver/4452/trunk/lib/redmine/views/builders.rb END