Mercurial > hg > soundsoftware-site
diff test/fixtures/.svn/entries @ 118:b859cc0c4fa1 cannam
Merge from branch "redmine-1.1"
author | Chris Cannam |
---|---|
date | Thu, 13 Jan 2011 13:21:03 +0000 |
parents | af80e5618e9b |
children | cd2282d2aa55 |
line wrap: on
line diff
--- a/test/fixtures/.svn/entries Thu Jan 06 10:41:19 2011 +0000 +++ b/test/fixtures/.svn/entries Thu Jan 13 13:21:03 2011 +0000 @@ -1,15 +1,15 @@ 10 dir -4411 -http://redmine.rubyforge.org/svn/trunk/test/fixtures +4707 +http://redmine.rubyforge.org/svn/branches/1.1-stable/test/fixtures http://redmine.rubyforge.org/svn -2010-11-14T13:48:01.671461Z -4404 -jplang +2011-01-11T04:22:31.643521Z +4684 +tmaruyama @@ -35,7 +35,7 @@ -2010-09-23T14:37:45.327799Z +2010-08-12T15:03:25.000000Z 7f7308fa24fe8015418b4bf81a265389 2009-12-06T10:28:20.099964Z 3123 @@ -72,7 +72,7 @@ -2010-09-23T14:37:45.327799Z +2010-08-12T15:03:25.000000Z 940bc0bea76bc76ba8ef1b224d744eee 2009-09-20T14:06:57.257282Z 2895 @@ -106,10 +106,10 @@ -2010-09-23T14:37:45.315821Z -1e9bc92faf43a6d556aea8f33ea974b0 -2009-09-20T15:20:22.385253Z -2898 +2011-01-13T12:50:17.000000Z +d3a777560e5a963bc848b30547a65d4b +2010-12-05T11:45:09.061840Z +4470 jplang has-props @@ -132,7 +132,7 @@ -2178 +2180 roles.yml file @@ -140,10 +140,10 @@ -2010-09-23T14:37:45.351765Z -5b2ffc98605c1c36dc346f3be44a9985 -2010-03-13T14:56:49.379682Z -3573 +2011-01-13T12:50:17.000000Z +15f318dd68723b4c4dab1e1ca66dd044 +2011-01-08T10:14:00.269730Z +4660 jplang has-props @@ -166,7 +166,7 @@ -3691 +3721 encoding dir @@ -177,7 +177,7 @@ -2010-09-23T14:37:45.355763Z +2010-08-12T15:03:25.000000Z a519d5e75a6d1ac1516064c882aa773c 2009-09-20T14:06:57.257282Z 2895 @@ -211,7 +211,7 @@ -2010-09-23T14:37:45.343799Z +2010-08-12T15:03:25.000000Z b7264b0f4d285dc38ba7139feaabafe2 2008-12-29T12:40:56.716698Z 2196 @@ -245,7 +245,7 @@ -2010-09-23T14:37:45.343799Z +2010-08-12T15:03:25.000000Z e9853df4a04648bcb9389127748b24c4 2009-09-20T14:06:57.257282Z 2895 @@ -279,7 +279,7 @@ -2010-09-23T14:37:45.351765Z +2010-08-12T15:03:25.000000Z 5259028ece10055ea04cb1baddadd334 2009-10-21T22:34:52.412718Z 2950 @@ -313,10 +313,10 @@ -2010-11-19T13:04:46.864726Z -4d480d87e42663a5e874353649c86039 -2010-11-07T14:15:01.891476Z -4382 +2011-01-13T12:50:17.000000Z +342c09046e9942f00cced7e066066202 +2010-12-11T10:47:00.859736Z +4488 jplang has-props @@ -347,7 +347,7 @@ -2010-09-23T14:37:45.343799Z +2010-08-12T15:03:25.000000Z b72e570a19a6a6297fd0e78a0c15d9a6 2009-09-20T14:06:57.257282Z 2895 @@ -381,7 +381,7 @@ -2010-09-23T14:37:45.327799Z +2010-08-12T15:03:25.000000Z e6b2256ffe56fa2baa64e474f5c920d6 2009-09-20T14:06:57.257282Z 2895 @@ -415,7 +415,7 @@ -2010-09-23T14:37:45.319762Z +2010-08-12T15:03:25.000000Z 7e42308ab41cac587386d54899cfcef5 2009-09-20T14:06:57.257282Z 2895 @@ -449,7 +449,7 @@ -2010-09-23T14:37:45.351765Z +2010-08-12T15:03:25.000000Z ad513155b260eb8a8739d4d13c2823a8 2009-12-19T13:32:21.556847Z 3194 @@ -483,7 +483,7 @@ -2010-09-23T14:37:45.327799Z +2010-08-12T15:03:25.000000Z 1cdfea6614ecba6cddecb3d4524c38ba 2009-12-26T16:14:55.591181Z 3250 @@ -517,7 +517,7 @@ -2010-09-23T14:37:45.319762Z +2010-08-12T15:03:25.000000Z 159394b420966c9e2f5ab0e31cb93b41 2009-11-27T20:32:28.228739Z 3099 @@ -554,7 +554,7 @@ -2010-09-23T14:37:45.351765Z +2010-08-12T15:03:25.000000Z e5a26332fd48dac7e33a963622f49994 2009-09-20T14:06:57.257282Z 2895 @@ -588,7 +588,7 @@ -2010-09-23T14:37:45.315821Z +2010-08-12T15:03:25.000000Z 909e55408711ba1774e1c071b162962f 2009-09-20T14:06:57.257282Z 2895 @@ -625,7 +625,7 @@ -2010-09-23T14:37:45.323763Z +2010-08-12T15:03:25.000000Z bafbddc194242dbdcac1f2bfc550c27b 2010-03-13T14:56:49.379682Z 3573 @@ -659,7 +659,7 @@ -2010-09-23T14:37:45.319762Z +2010-08-12T15:03:25.000000Z c6789a99aba9f28cf1d31a36b36224c8 2010-01-03T11:18:09.741250Z 3278 @@ -693,11 +693,11 @@ -2010-11-19T13:04:46.864726Z -6d21fa7811e1d7b4a1db0f4062fcba45 -2010-09-26T18:13:31.522853Z -4186 -edavis10 +2011-01-13T12:50:17.000000Z +a8c37ca171bb5f39ffbc6cd3ffcf0c52 +2010-12-10T11:06:21.419457Z +4482 +jplang has-props @@ -719,7 +719,7 @@ -5661 +5656 member_roles.yml file @@ -727,7 +727,7 @@ -2010-09-23T14:37:45.343799Z +2010-08-12T15:03:25.000000Z 86387d627355e1debc04c364c29efe81 2009-12-26T16:14:55.591181Z 3250 @@ -761,7 +761,7 @@ -2010-09-23T14:37:45.343799Z +2010-08-12T15:03:25.000000Z b5bafc332d23c9efcc2ef648a9a393b9 2009-11-16T18:07:30.910440Z 3071 @@ -795,7 +795,7 @@ -2010-09-23T14:37:45.355763Z +2010-08-12T15:03:25.000000Z 8e7549cddb3ed2eb4c5778e3506e3e0c 2010-02-11T19:30:53.136370Z 3412 @@ -829,7 +829,7 @@ -2010-09-23T14:37:45.351765Z +2010-08-12T15:03:25.000000Z 9dbcd982c4227d919ea750ce4fde79a7 2009-02-12T17:35:57.542817Z 2456 @@ -863,11 +863,11 @@ -2010-09-23T14:37:45.319762Z -8a815e166641ad170ffddcf33646ca04 -2010-08-22T18:42:00.112555Z -4013 -edavis10 +2011-01-13T12:50:17.000000Z +c1fe3d9f5bbcbf5cf73c684b744d0c7a +2010-12-12T17:00:52.100205Z +4505 +jplang has-props @@ -889,7 +889,7 @@ -1539 +1600 wiki_pages.yml file @@ -897,7 +897,7 @@ -2010-09-23T14:37:45.355763Z +2010-08-12T15:03:25.000000Z f32671fee76259eb7dbe8f57ed503c99 2010-02-11T19:30:53.136370Z 3412 @@ -931,7 +931,7 @@ -2010-09-23T14:37:45.315821Z +2010-08-12T15:03:25.000000Z 0cb04e10717d1de94f328dd92f2e9f8c 2009-09-20T14:06:57.257282Z 2895 @@ -965,7 +965,7 @@ -2010-09-23T14:37:45.351765Z +2010-08-12T15:03:25.000000Z fcf009196cf46bc9d64e947e8275e51f 2009-09-20T14:06:57.257282Z 2895 @@ -1002,7 +1002,7 @@ -2010-09-23T14:37:45.343799Z +2010-08-12T15:03:25.000000Z a12098ae3dcc7df2fffdc5aabc036445 2009-12-26T16:14:55.591181Z 3250 @@ -1039,7 +1039,7 @@ -2010-09-23T14:37:45.327799Z +2010-08-12T15:03:25.000000Z 0f791723030addfd84aeb8e8478b4373 2009-12-06T10:28:20.099964Z 3123 @@ -1073,7 +1073,7 @@ -2010-09-23T14:37:45.355763Z +2010-08-12T15:03:25.000000Z be9ed58ec8ae1a4d2e1608c712c480be 2009-09-20T14:06:57.257282Z 2895 @@ -1107,7 +1107,7 @@ -2010-09-23T14:37:45.319762Z +2010-08-12T15:03:25.000000Z 28c83450d87eb6a49fe3d920f05e16b7 2010-01-14T20:00:17.463579Z 3313 @@ -1141,7 +1141,7 @@ -2010-11-19T13:04:46.864726Z +2010-11-30T13:11:53.000000Z f590d477ec468a76d8d31d5ed99de0e6 2010-09-28T18:22:00.231301Z 4216 @@ -1175,7 +1175,7 @@ -2010-09-23T14:37:45.315821Z +2010-08-12T15:03:25.000000Z f299e9e4f8b4310d276f3cc0bd4573a2 2010-02-26T08:42:40.283735Z 3490 @@ -1209,7 +1209,7 @@ -2010-09-23T14:37:45.343799Z +2010-08-12T15:03:25.000000Z f41152c0bbe67b30733fb44c847c0c28 2009-12-13T12:39:22.716082Z 3167 @@ -1243,7 +1243,7 @@ -2010-09-23T14:37:45.327799Z +2010-08-12T15:03:25.000000Z 14b2db45f35ee3e6f8c2a8a05b94c82b 2009-11-07T08:44:56.035544Z 3013 @@ -1277,7 +1277,7 @@ -2010-09-23T14:37:45.351765Z +2010-08-12T15:03:25.000000Z 0670d0dee081a5f922aa2d3ff7af9764 2009-12-06T10:28:20.099964Z 3123 @@ -1311,7 +1311,7 @@ -2010-09-23T14:37:45.315821Z +2010-08-12T15:03:25.000000Z c3c2ab815b9af7fb01ccafc5fc881f87 2009-10-25T11:23:46.266302Z 2976 @@ -1345,10 +1345,10 @@ -2010-09-23T14:37:45.315821Z -58f19425b758eec08d68749a9408b258 -2009-12-06T10:28:20.099964Z -3123 +2011-01-13T12:50:17.000000Z +f1eb2bca91151fd51902d2ddc0d11773 +2010-11-27T12:42:11.793330Z +4431 jplang has-props @@ -1371,7 +1371,7 @@ -3692 +3991 news.yml file @@ -1379,10 +1379,10 @@ -2010-09-23T14:37:45.343799Z -f926570b0d32ca1702d16de3f57e0262 -2009-09-20T14:06:57.257282Z -2895 +2011-01-13T12:50:17.000000Z +3106fd060b768ea17e35b5ea975e0aca +2010-12-12T17:00:52.100205Z +4505 jplang has-props @@ -1405,7 +1405,7 @@ -558 +753 trackers.yml file @@ -1413,7 +1413,7 @@ -2010-09-23T14:37:45.351765Z +2010-08-12T15:03:25.000000Z 644bd85c22127195b9f31217cce0595e 2009-09-20T14:06:57.257282Z 2895