diff app/views/projects/settings/.svn/entries @ 129:5e974759e8b2 cannam

Merge from the default branch
author Chris Cannam
date Wed, 19 Jan 2011 15:15:02 +0000
parents cd2282d2aa55 07fa8a8b56a8
children eeebe205a056
line wrap: on
line diff
--- a/app/views/projects/settings/.svn/entries	Wed Jan 19 13:27:01 2011 +0000
+++ b/app/views/projects/settings/.svn/entries	Wed Jan 19 15:15:02 2011 +0000
@@ -1,14 +1,14 @@
 10
 
 dir
-4707
+4732
 http://redmine.rubyforge.org/svn/trunk/app/views/projects/settings
 http://redmine.rubyforge.org/svn
 
 
 
-2011-01-06T20:57:17.003359Z
-4647
+2011-01-15T13:20:18.866830Z
+4719
 jplang
 
 
@@ -270,10 +270,10 @@
 
 
 
-2010-11-19T13:04:49.460909Z
-ed4707b71316abb3bdcba3d525f83c9e
-2010-11-06T12:04:24.600306Z
-4371
+2011-01-19T15:03:32.000000Z
+6e7a70ea4a2a2fe46b75b968d19bb68e
+2011-01-15T13:20:18.866830Z
+4719
 jplang
 has-props
 
@@ -296,5 +296,5 @@
 
 
 
-4120
+4155