Mercurial > hg > soundsoftware-site
diff test/fixtures/encoding/.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/test/fixtures/encoding/.svn/entries Thu Mar 03 15:08:45 2011 +0000 +++ b/test/fixtures/encoding/.svn/entries Mon Jun 06 14:41:04 2011 +0100 @@ -1,8 +1,8 @@ 10 dir -4993 -http://redmine.rubyforge.org/svn/trunk/test/fixtures/encoding +6000 +http://redmine.rubyforge.org/svn/branches/1.2-stable/test/fixtures/encoding http://redmine.rubyforge.org/svn @@ -32,7 +32,7 @@ -2011-03-03T11:05:09.000000Z +2011-06-06T13:15:00.000000Z eee83cf374737071543358b83f85f75b 2010-02-20T11:24:41.988635Z 3466