diff vendor/plugins/.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/vendor/plugins/.svn/entries	Thu Jan 13 13:21:03 2011 +0000
+++ b/vendor/plugins/.svn/entries	Thu Jan 13 14:33:08 2011 +0000
@@ -2,13 +2,13 @@
 
 dir
 4707
-http://redmine.rubyforge.org/svn/branches/1.1-stable/vendor/plugins
+http://redmine.rubyforge.org/svn/trunk/vendor/plugins
 http://redmine.rubyforge.org/svn
 
 
 
-2010-12-10T10:48:16.342425Z
-4481
+2011-01-01T11:45:12.617336Z
+4602
 jplang
 
 
@@ -41,10 +41,10 @@
 engines
 dir
 
-classic_pagination
+coderay-0.9.2
 dir
 
-coderay-0.9.2
+classic_pagination
 dir
 
 acts_as_versioned