Mercurial > hg > soundsoftware-site
diff lib/redmine/export/.svn/entries @ 246:eeebe205a056 cannam
* Merge from default branch, bringing us up to SVN trunk rev 4993
author | Chris Cannam |
---|---|
date | Thu, 03 Mar 2011 12:02:03 +0000 |
parents | 5e974759e8b2 051f544170fe |
children | 753f1380d6bc |
line wrap: on
line diff
--- a/lib/redmine/export/.svn/entries Thu Jan 20 09:59:02 2011 +0000 +++ b/lib/redmine/export/.svn/entries Thu Mar 03 12:02:03 2011 +0000 @@ -1,15 +1,15 @@ 10 dir -4732 -http://redmine.rubyforge.org/svn/branches/1.1-stable/lib/redmine/export +4993 +http://redmine.rubyforge.org/svn/trunk/lib/redmine/export http://redmine.rubyforge.org/svn -2010-09-20T02:55:20.180218Z -4104 -edavis10 +2011-01-22T11:57:02.732751Z +4736 +jplang @@ -32,11 +32,11 @@ -2010-10-01T15:15:02.000000Z -aa6093490555bdd119ba8f1d34cab080 -2010-09-20T02:55:20.180218Z -4104 -edavis10 +2011-03-03T11:05:14.000000Z +b8bd24e9575d51f0c49f8245a5d593a2 +2011-01-22T11:57:02.732751Z +4736 +jplang has-props @@ -58,5 +58,5 @@ -10771 +10786