diff lib/redmine/scm/.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/scm/.svn/entries	Thu Jun 09 16:51:06 2011 +0100
+++ b/lib/redmine/scm/.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/scm
+6270
+http://redmine.rubyforge.org/svn/branches/1.2-stable/lib/redmine/scm
 http://redmine.rubyforge.org/svn
 
 
 
-2010-11-07T15:19:05.831621Z
-4386
-jbbarth
+2011-07-11T02:08:03.947910Z
+6253
+tmaruyama
 
 
 
@@ -35,7 +35,7 @@
 
 
 
-2010-09-23T14:37:45.043748Z
+2011-07-14T09:24:10.000000Z
 3a053c03d210decd9105a24ff5e1aa8f
 2010-02-16T22:41:59.625572Z
 3440