Mercurial > hg > soundsoftware-site
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 519:3be6bc3c2a17 | 524:1248a47e81b3 |
|---|---|
| 1 K 25 | 1 K 25 |
| 2 svn:wc:ra_dav:version-url | 2 svn:wc:ra_dav:version-url |
| 3 V 69 | 3 V 83 |
| 4 /svn/!svn/ver/2114/trunk/vendor/plugins/acts_as_activity_provider/lib | 4 /svn/!svn/ver/5878/branches/1.2-stable/vendor/plugins/acts_as_activity_provider/lib |
| 5 END | 5 END |
| 6 acts_as_activity_provider.rb | 6 acts_as_activity_provider.rb |
| 7 K 25 | 7 K 25 |
| 8 svn:wc:ra_dav:version-url | 8 svn:wc:ra_dav:version-url |
| 9 V 98 | 9 V 112 |
| 10 /svn/!svn/ver/2114/trunk/vendor/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb | 10 /svn/!svn/ver/5878/branches/1.2-stable/vendor/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb |
| 11 END | 11 END |