Mercurial > hg > soundsoftware-site
diff app/.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/app/.svn/entries Thu Jan 20 09:59:02 2011 +0000 +++ b/app/.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/app +4993 +http://redmine.rubyforge.org/svn/trunk/app http://redmine.rubyforge.org/svn -2011-01-16T16:36:58.753919Z -4731 -jplang +2011-03-03T03:30:10.954225Z +4990 +tmaruyama