Mercurial > hg > soundsoftware-site
diff db/.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/db/.svn/entries Thu Jun 09 16:51:06 2011 +0100 +++ b/db/.svn/entries Thu Jul 14 10:43:07 2011 +0100 @@ -1,15 +1,15 @@ 10 dir -4411 -http://redmine.rubyforge.org/svn/trunk/db +6270 +http://redmine.rubyforge.org/svn/branches/1.2-stable/db http://redmine.rubyforge.org/svn -2010-11-14T12:33:14.198318Z -4402 -jplang +2011-05-12T17:29:18.150936Z +5762 +tmaruyama has-props