Mercurial > hg > soundsoftware-site
diff vendor/plugins/acts_as_activity_provider/lib/.svn/all-wcprops @ 524:1248a47e81b3 feature_36
Merge from branch "luisf"
author | luisf <luis.figueira@eecs.qmul.ac.uk> |
---|---|
date | Mon, 25 Jul 2011 14:39:38 +0100 |
parents | cbce1fd3b1b7 |
children |
line wrap: on
line diff
--- a/vendor/plugins/acts_as_activity_provider/lib/.svn/all-wcprops Fri Jul 15 17:21:05 2011 +0100 +++ b/vendor/plugins/acts_as_activity_provider/lib/.svn/all-wcprops Mon Jul 25 14:39:38 2011 +0100 @@ -1,11 +1,11 @@ K 25 svn:wc:ra_dav:version-url -V 69 -/svn/!svn/ver/2114/trunk/vendor/plugins/acts_as_activity_provider/lib +V 83 +/svn/!svn/ver/5878/branches/1.2-stable/vendor/plugins/acts_as_activity_provider/lib END acts_as_activity_provider.rb K 25 svn:wc:ra_dav:version-url -V 98 -/svn/!svn/ver/2114/trunk/vendor/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb +V 112 +/svn/!svn/ver/5878/branches/1.2-stable/vendor/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb END