Mercurial > hg > soundsoftware-site
diff test/fixtures/files/.svn/entries @ 120:cd2282d2aa55 cannam
Merge from the default branch. Note that this is not a valid SVN repository any more (use default, redmine-1.1 etc for SVN updates).
author | Chris Cannam |
---|---|
date | Thu, 13 Jan 2011 14:33:08 +0000 |
parents | af80e5618e9b 8661b858af72 |
children | 5e974759e8b2 |
line wrap: on
line diff
--- a/test/fixtures/files/.svn/entries Thu Jan 13 13:21:03 2011 +0000 +++ b/test/fixtures/files/.svn/entries Thu Jan 13 14:33:08 2011 +0000 @@ -2,13 +2,13 @@ dir 4707 -http://redmine.rubyforge.org/svn/branches/1.1-stable/test/fixtures/files +http://redmine.rubyforge.org/svn/trunk/test/fixtures/files http://redmine.rubyforge.org/svn -2008-12-02T17:57:13.240321Z -2085 +2011-01-01T13:40:36.520874Z +4604 jplang @@ -26,16 +26,16 @@ e93f8b46-1217-0410-a6f0-8f06a7374b81 -060719210727_changeset.diff +060719210727_changeset_iso8859-1.diff file -2010-08-12T15:03:25.000000Z -15a82d7463bda303b58595b5d05d8f05 -2008-06-09T18:40:59.518583Z -1520 +2011-01-13T14:09:10.000000Z +8ab69915b7f66c8199e6d137073d9ffe +2011-01-01T13:40:36.520874Z +4604 jplang has-props @@ -58,7 +58,41 @@ -687 +686 + +060719210727_changeset_utf8.diff +file + + + + +2011-01-13T14:09:10.000000Z +69b7e1bc8546406b1ddc3719d879254c +2011-01-01T13:40:36.520874Z +4604 +jplang + + + + + + + + + + + + + + + + + + + + + +704 060719210727_archive.zip file @@ -66,7 +100,7 @@ -2010-08-12T15:03:25.000000Z +2010-09-23T14:37:45.323763Z 8b4167c6b87869174dd17db0694ef2e1 2008-06-09T18:40:59.518583Z 1520 @@ -100,7 +134,7 @@ -2010-08-12T15:03:25.000000Z +2010-09-23T14:37:45.323763Z c72c8a9a0de99c39f9e6d712c13b7624 2008-06-09T18:40:59.518583Z 1520 @@ -134,7 +168,7 @@ -2010-08-12T15:03:25.000000Z +2010-09-23T14:37:45.323763Z 1478adae0d4eb06d35897518540e25d6 2008-12-02T17:57:13.240321Z 2085