diff lib/generators/redmine_plugin_controller/.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/generators/redmine_plugin_controller/.svn/entries	Thu Jun 09 16:51:06 2011 +0100
+++ b/lib/generators/redmine_plugin_controller/.svn/entries	Thu Jul 14 10:43:07 2011 +0100
@@ -1,15 +1,15 @@
 10
 
 dir
-4411
-http://redmine.rubyforge.org/svn/trunk/lib/generators/redmine_plugin_controller
+6270
+http://redmine.rubyforge.org/svn/branches/1.2-stable/lib/generators/redmine_plugin_controller
 http://redmine.rubyforge.org/svn
 
 
 
-2010-06-17T19:02:07.893033Z
-3770
-edavis10
+2011-06-21T03:16:49.595160Z
+6105
+jbbarth
 
 
 
@@ -32,7 +32,7 @@
 
 
 
-2010-09-23T14:37:44.991758Z
+2011-07-14T09:24:10.000000Z
 60c1792566a450d246dd66ff274ae06c
 2008-09-05T10:31:06.632668Z
 1786
@@ -66,11 +66,11 @@
 
 
 
-2010-09-23T14:37:44.991758Z
+2011-07-14T09:28:12.000000Z
 23b15404071adb39cb140a6113057f15
-2010-02-28T12:15:47.320153Z
-3514
-jplang
+2011-06-21T03:16:49.595160Z
+6105
+jbbarth
 has-props