diff app/views/projects/.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/.svn/entries	Thu Jan 13 13:21:03 2011 +0000
+++ b/app/views/projects/.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
+http://redmine.rubyforge.org/svn/trunk/app/views/projects
 http://redmine.rubyforge.org/svn
 
 
 
-2011-01-08T10:14:00.269730Z
-4660
+2011-01-06T21:02:19.982329Z
+4648
 jplang
 
 
@@ -32,7 +32,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.643780Z
 26653788620aef89a25b8ad819144e03
 2010-03-21T11:17:29.163519Z
 3608
@@ -69,10 +69,10 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:29.000000Z
 89a2baf21090ed983ffe265fa0929b29
-2011-01-08T10:14:00.269730Z
-4660
+2011-01-06T21:02:19.982329Z
+4648
 jplang
 has-props
 
@@ -103,7 +103,7 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:29.000000Z
 4eef8200b378cb9b074da5abac7c5dfa
 2010-12-23T13:34:44.668484Z
 4572
@@ -137,7 +137,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.643780Z
 66d45b68c4615d2b502b2c6d06cf0951
 2009-09-12T09:13:13.676884Z
 2871
@@ -171,7 +171,7 @@
 
 
 
-2010-11-30T13:11:53.000000Z
+2010-11-19T13:04:49.468916Z
 bbcdfa64f2a80d809b80b00c26fd0c8c
 2010-11-07T14:15:01.891476Z
 4382
@@ -205,10 +205,10 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:29.000000Z
 b0519f745853f4f4e673c2e30389dc40
-2011-01-08T10:14:00.269730Z
-4660
+2011-01-06T21:02:19.982329Z
+4648
 jplang
 has-props
 
@@ -239,7 +239,7 @@
 
 
 
-2010-10-01T15:15:02.000000Z
+2010-09-24T12:48:28.959844Z
 e3a6cb86da5f31cae6c8fc0a4e6bad35
 2010-09-09T18:57:21.507694Z
 4071
@@ -273,7 +273,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.643780Z
 0f2ffbd9b87d4ecc80f5c8bcac0cc9e9
 2009-10-29T18:44:16.555741Z
 2990
@@ -307,7 +307,7 @@
 
 
 
-2010-09-10T14:59:24.000000Z
+2010-09-23T14:37:44.639741Z
 f880a7facfac62099e5b3fc4ebe862b3
 2010-08-19T22:24:37.242219Z
 4009
@@ -341,7 +341,7 @@
 
 
 
-2011-01-13T12:46:09.000000Z
+2010-09-24T12:48:28.959844Z
 cb60b85b211b8c78058e4ccc5cdefc82
 2010-09-07T15:00:27.481481Z
 4069
@@ -375,7 +375,7 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:29.000000Z
 c49d7ceec0060eb7437c7e3f2b7629ed
 2010-12-11T10:19:11.273304Z
 4486
@@ -409,7 +409,7 @@
 
 
 
-2010-10-01T15:15:02.000000Z
+2010-09-24T12:48:28.959844Z
 308fa6064dd3e4d6d85be448402ba7b2
 2010-09-09T18:57:21.507694Z
 4071