diff extra/sample_plugin/app/controllers/.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/extra/sample_plugin/app/controllers/.svn/entries	Thu Jun 09 16:51:06 2011 +0100
+++ b/extra/sample_plugin/app/controllers/.svn/entries	Thu Jul 14 10:43:07 2011 +0100
@@ -1,8 +1,8 @@
 10
 
 dir
-4411
-http://redmine.rubyforge.org/svn/trunk/extra/sample_plugin/app/controllers
+6270
+http://redmine.rubyforge.org/svn/branches/1.2-stable/extra/sample_plugin/app/controllers
 http://redmine.rubyforge.org/svn
 
 
@@ -32,7 +32,7 @@
 
 
 
-2010-09-23T14:37:44.943755Z
+2011-07-14T09:24:09.000000Z
 9e3b32d475f8b06df8d45b28a2732d76
 2009-02-21T11:04:50.579477Z
 2493