diff .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/.svn/entries	Thu Jan 13 13:21:03 2011 +0000
+++ b/.svn/entries	Thu Jan 13 14:33:08 2011 +0000
@@ -7,8 +7,8 @@
 
 
 
-2011-01-13T12:10:52.246705Z
-4707
+2011-01-13T12:05:11.734883Z
+4705
 tmaruyama
 has-props
 
@@ -38,10 +38,10 @@
 
 
 
-2011-01-13T12:50:18.000000Z
+2011-01-13T14:11:09.000000Z
 0f5961e6af62737d2a1f5e3ad47f8c89
-2011-01-01T21:20:25.151491Z
-4607
+2011-01-01T21:07:43.412022Z
+4606
 tmaruyama
 
 
@@ -103,6 +103,9 @@
 
 307
 
+extra
+dir
+
 README.rdoc
 file
 
@@ -137,9 +140,6 @@
 
 208
 
-extra
-dir
-
 db
 dir
 
@@ -155,12 +155,6 @@
 script
 dir
 
-doc
-dir
-
-config
-dir
-
 .gitignore
 file
 
@@ -195,6 +189,12 @@
 
 322
 
+config
+dir
+
+doc
+dir
+
 lib
 dir