diff test/.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/.svn/entries	Thu Jan 13 13:21:03 2011 +0000
+++ b/test/.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
+http://redmine.rubyforge.org/svn/trunk/test
 http://redmine.rubyforge.org/svn
 
 
 
-2011-01-13T12:10:52.246705Z
-4707
+2011-01-13T12:05:11.734883Z
+4705
 tmaruyama
 
 
@@ -35,7 +35,7 @@
 
 
 
-2010-10-01T15:15:02.000000Z
+2010-09-24T12:48:25.883734Z
 bec9d26a7ae75350529040e7bca36bfa
 2010-09-10T19:44:45.405792Z
 4078
@@ -72,10 +72,10 @@
 
 
 
-2011-01-13T12:50:17.000000Z
-317caa69be4bc48128681a8da3b640f1
-2010-12-23T14:49:14.339855Z
-4573
+2011-01-13T14:09:10.000000Z
+07898564890be4ff9e6c039fa6aa9d41
+2011-01-01T12:24:18.924489Z
+4603
 jplang
 has-props
 
@@ -98,7 +98,7 @@
 
 
 
-16991
+16997
 
 functional
 dir
@@ -118,7 +118,7 @@
 
 
 
-2010-08-12T15:03:26.000000Z
+2010-09-23T14:37:45.427769Z
 29604d905b321f5bf19b86f7b9797394
 2009-09-13T17:14:35.707881Z
 2887