Mercurial > hg > soundsoftware-site
diff test/fixtures/encoding/.svn/entries @ 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 | 851510f1b535 |
children |
line wrap: on
line diff
--- a/test/fixtures/encoding/.svn/entries Fri Jul 15 17:21:05 2011 +0100 +++ b/test/fixtures/encoding/.svn/entries Mon Jul 25 14:39:38 2011 +0100 @@ -1,8 +1,8 @@ 10 dir -4411 -http://redmine.rubyforge.org/svn/trunk/test/fixtures/encoding +6270 +http://redmine.rubyforge.org/svn/branches/1.2-stable/test/fixtures/encoding http://redmine.rubyforge.org/svn @@ -32,7 +32,7 @@ -2010-09-23T14:37:45.323763Z +2011-07-14T09:24:10.000000Z eee83cf374737071543358b83f85f75b 2010-02-20T11:24:41.988635Z 3466