Mercurial > hg > soundsoftware-site
diff app/views/projects/settings/.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/app/views/projects/settings/.svn/entries Thu Jan 13 13:21:03 2011 +0000 +++ b/app/views/projects/settings/.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/app/views/projects/settings +http://redmine.rubyforge.org/svn/trunk/app/views/projects/settings http://redmine.rubyforge.org/svn -2011-01-08T10:14:00.269730Z -4660 +2011-01-06T20:57:17.003359Z +4647 jplang @@ -32,7 +32,7 @@ -2010-08-12T15:03:25.000000Z +2010-09-23T14:37:44.647782Z 3f93ad7df3a43b70f004499bacc76cdf 2010-05-09T11:19:15.980195Z 3734 @@ -66,7 +66,7 @@ -2011-01-13T12:46:09.000000Z +2010-09-23T14:37:44.651752Z 1fd25ea9af565c8a79ac61c918cbd3fc 2010-01-21T18:21:56.082191Z 3336 @@ -100,7 +100,7 @@ -2010-08-12T15:03:25.000000Z +2010-09-23T14:37:44.651752Z 1ee550d6ee54d0c528eee8bb142c496d 2008-02-12T22:43:37.870107Z 1143 @@ -134,7 +134,7 @@ -2010-10-01T15:15:02.000000Z +2010-09-24T12:48:28.400004Z 14f07f16cc36c896e6dc4d975c7ef807 2010-09-10T16:00:49.687515Z 4075 @@ -168,10 +168,10 @@ -2011-01-13T12:50:17.000000Z +2011-01-13T14:09:24.000000Z 6dc73d6291a5471699054e6fbd33da8e -2011-01-08T10:14:00.269730Z -4660 +2011-01-06T20:57:17.003359Z +4647 jplang has-props @@ -202,7 +202,7 @@ -2010-11-30T13:11:53.000000Z +2010-11-19T13:04:49.460909Z 4f26d985da6ada4c0d724095490050c5 2010-10-29T22:40:02.439890Z 4307 @@ -236,7 +236,7 @@ -2010-08-12T15:03:25.000000Z +2010-09-23T14:37:44.647782Z 1d2eb75d2aa1ff66975f701d6b45c059 2010-05-09T11:19:15.980195Z 3734 @@ -270,7 +270,7 @@ -2011-01-13T12:46:09.000000Z +2010-11-19T13:04:49.460909Z ed4707b71316abb3bdcba3d525f83c9e 2010-11-06T12:04:24.600306Z 4371