Mercurial > hg > soundsoftware-site
diff vendor/plugins/acts_as_activity_provider/.svn/entries @ 514:7eba09d624db live
Merge
author | Chris Cannam |
---|---|
date | Thu, 14 Jul 2011 10:50:53 +0100 |
parents | 851510f1b535 |
children |
line wrap: on
line diff
--- a/vendor/plugins/acts_as_activity_provider/.svn/entries Thu Jul 14 10:46:20 2011 +0100 +++ b/vendor/plugins/acts_as_activity_provider/.svn/entries Thu Jul 14 10:50:53 2011 +0100 @@ -1,14 +1,14 @@ 10 dir -4411 -http://redmine.rubyforge.org/svn/trunk/vendor/plugins/acts_as_activity_provider +6270 +http://redmine.rubyforge.org/svn/branches/1.2-stable/vendor/plugins/acts_as_activity_provider http://redmine.rubyforge.org/svn -2008-12-08T18:20:26.452857Z -2114 +2011-04-05T12:52:20.839202Z +5325 jplang @@ -32,7 +32,7 @@ -2010-09-23T14:37:45.531765Z +2011-07-14T09:24:10.000000Z 779d73c171dc111df084a0798cca73e2 2008-07-27T17:54:09.197937Z 1701