diff lib/redmine/wiki_formatting/.svn/entries @ 442:753f1380d6bc cannam

Merge from branch "redmine-1.2"
author Chris Cannam
date Mon, 06 Jun 2011 14:41:04 +0100
parents eeebe205a056 cbce1fd3b1b7
children 851510f1b535
line wrap: on
line diff
--- a/lib/redmine/wiki_formatting/.svn/entries	Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/wiki_formatting/.svn/entries	Mon Jun 06 14:41:04 2011 +0100
@@ -1,14 +1,14 @@
 10
 
 dir
-4993
-http://redmine.rubyforge.org/svn/trunk/lib/redmine/wiki_formatting
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/lib/redmine/wiki_formatting
 http://redmine.rubyforge.org/svn
 
 
 
-2010-11-06T17:47:27.890964Z
-4376
+2011-03-28T20:16:05.752041Z
+5242
 jplang
 
 
@@ -32,7 +32,7 @@
 
 
 
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:15:00.000000Z
 879f8ce24a6bb5e4f5ea3b6f798b7a63
 2010-11-06T17:47:27.890964Z
 4376