Mercurial > hg > soundsoftware-site
diff extra/sample_plugin/app/models/.svn/entries @ 442:753f1380d6bc cannam
Merge from branch "redmine-1.2"
author | Chris Cannam |
---|---|
date | Mon, 06 Jun 2011 14:41:04 +0100 |
parents | eeebe205a056 cbce1fd3b1b7 |
children | 851510f1b535 |
line wrap: on
line diff
--- a/extra/sample_plugin/app/models/.svn/entries Thu Mar 03 15:08:45 2011 +0000 +++ b/extra/sample_plugin/app/models/.svn/entries Mon Jun 06 14:41:04 2011 +0100 @@ -1,8 +1,8 @@ 10 dir -4993 -http://redmine.rubyforge.org/svn/trunk/extra/sample_plugin/app/models +6000 +http://redmine.rubyforge.org/svn/branches/1.2-stable/extra/sample_plugin/app/models http://redmine.rubyforge.org/svn @@ -32,7 +32,7 @@ -2011-03-03T11:05:11.000000Z +2011-06-06T13:15:00.000000Z 5161ccc668c61730638ef23bec50232f 2008-07-27T19:18:35.954247Z 1704