Mercurial > hg > soundsoftware-site
diff config/.svn/all-wcprops @ 38:33d69fee1d99 cannam
* Merge SVN update from default branch
| author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
|---|---|
| date | Fri, 19 Nov 2010 13:41:40 +0000 |
| parents | 94944d00e43c |
| children | af80e5618e9b 8661b858af72 |
line wrap: on
line diff
--- a/config/.svn/all-wcprops Fri Oct 01 15:33:14 2010 +0100 +++ b/config/.svn/all-wcprops Fri Nov 19 13:41:40 2010 +0000 @@ -1,13 +1,13 @@ K 25 svn:wc:ra_dav:version-url V 31 -/svn/!svn/ver/4173/trunk/config +/svn/!svn/ver/4405/trunk/config END settings.yml K 25 svn:wc:ra_dav:version-url V 44 -/svn/!svn/ver/4013/trunk/config/settings.yml +/svn/!svn/ver/4362/trunk/config/settings.yml END email.yml.example K 25 @@ -19,7 +19,7 @@ K 25 svn:wc:ra_dav:version-url V 41 -/svn/!svn/ver/4172/trunk/config/routes.rb +/svn/!svn/ver/4372/trunk/config/routes.rb END boot.rb K 25