diff lib/redmine/export/.svn/entries @ 511:107d36338b70 live

Merge from branch "cannam"
author Chris Cannam
date Thu, 14 Jul 2011 10:43:07 +0100
parents 851510f1b535
children
line wrap: on
line diff
--- a/lib/redmine/export/.svn/entries	Thu Jun 09 16:51:06 2011 +0100
+++ b/lib/redmine/export/.svn/entries	Thu Jul 14 10:43:07 2011 +0100
@@ -1,15 +1,15 @@
 10
 
 dir
-4411
-http://redmine.rubyforge.org/svn/trunk/lib/redmine/export
+6270
+http://redmine.rubyforge.org/svn/branches/1.2-stable/lib/redmine/export
 http://redmine.rubyforge.org/svn
 
 
 
-2010-09-20T02:55:20.180218Z
-4104
-edavis10
+2011-07-02T13:15:54.719761Z
+6153
+tmaruyama
 
 
 
@@ -32,11 +32,11 @@
 
 
 
-2010-09-24T12:48:29.791863Z
-aa6093490555bdd119ba8f1d34cab080
-2010-09-20T02:55:20.180218Z
-4104
-edavis10
+2011-07-14T09:28:12.000000Z
+1a01e5ae7cc73f48f39fea205f6f4db2
+2011-07-02T13:15:54.719761Z
+6153
+tmaruyama
 has-props
 
 
@@ -58,5 +58,5 @@
 
 
 
-10771
+15568