Mercurial > hg > soundsoftware-site
diff config/.svn/entries @ 51:371eac10df0b live
* Merge from "cannam" branch. This includes update to Redmine trunk, plus welcome/tip-of-the-day from luisf branch.
author | Chris Cannam |
---|---|
date | Wed, 24 Nov 2010 12:20:08 +0000 |
parents | 94944d00e43c |
children | af80e5618e9b 8661b858af72 |
line wrap: on
line diff
--- a/config/.svn/entries Thu Oct 21 11:19:14 2010 +0100 +++ b/config/.svn/entries Wed Nov 24 12:20:08 2010 +0000 @@ -1,15 +1,15 @@ 10 dir -4173 +4411 http://redmine.rubyforge.org/svn/trunk/config http://redmine.rubyforge.org/svn -2010-09-23T16:23:39.070168Z -4173 -winterheart +2010-11-14T15:14:19.280754Z +4405 +jplang has-props @@ -32,10 +32,10 @@ -2010-09-23T14:37:44.815730Z -a95b266d8b929a282cfb7bcc8441227b -2010-08-22T18:42:00.112555Z -4013 +2010-11-19T13:04:51.216928Z +974e583c59b4497382d2aa08f2b2ff01 +2010-11-02T19:00:36.834304Z +4362 edavis10 has-props @@ -58,7 +58,7 @@ -4020 +4106 email.yml.example file @@ -103,11 +103,11 @@ -2010-09-24T12:48:29.787906Z -ec1a5ef5a75a55fb2b1edbbfca6725d4 -2010-09-23T15:20:19.085385Z -4172 -edavis10 +2010-11-19T13:04:51.216928Z +3817ace6dd9dfb2fda37c5a67605b5e0 +2010-11-06T13:22:23.662480Z +4372 +jplang has-props @@ -129,7 +129,7 @@ -16319 +14427 boot.rb file