comparison vendor/plugins/acts_as_activity_provider/.svn/all-wcprops @ 514:7eba09d624db live

Merge
author Chris Cannam
date Thu, 14 Jul 2011 10:50:53 +0100
parents cbce1fd3b1b7
children
comparison
equal deleted inserted replaced
512:b9aebdd7dd40 514:7eba09d624db
1 K 25 1 K 25
2 svn:wc:ra_dav:version-url 2 svn:wc:ra_dav:version-url
3 V 65 3 V 79
4 /svn/!svn/ver/2114/trunk/vendor/plugins/acts_as_activity_provider 4 /svn/!svn/ver/5878/branches/1.2-stable/vendor/plugins/acts_as_activity_provider
5 END 5 END
6 init.rb
7 K 25
8 svn:wc:ra_dav:version-url
9 V 73
10 /svn/!svn/ver/1701/trunk/vendor/plugins/acts_as_activity_provider/init.rb
11 END