Mercurial > hg > soundsoftware-site
diff lib/tasks/.svn/all-wcprops @ 514:7eba09d624db live
Merge
author | Chris Cannam |
---|---|
date | Thu, 14 Jul 2011 10:50:53 +0100 |
parents | 851510f1b535 |
children |
line wrap: on
line diff
--- a/lib/tasks/.svn/all-wcprops Thu Jul 14 10:46:20 2011 +0100 +++ b/lib/tasks/.svn/all-wcprops Thu Jul 14 10:50:53 2011 +0100 @@ -1,119 +1,29 @@ K 25 svn:wc:ra_dav:version-url -V 34 -/svn/!svn/ver/4405/trunk/lib/tasks +V 48 +/svn/!svn/ver/6105/branches/1.2-stable/lib/tasks END -deprecated.rake +locales.rake K 25 svn:wc:ra_dav:version-url -V 49 -/svn/!svn/ver/691/trunk/lib/tasks/deprecated.rake -END -jdbc.rake -K 25 -svn:wc:ra_dav:version-url -V 44 -/svn/!svn/ver/3721/trunk/lib/tasks/jdbc.rake +V 61 +/svn/!svn/ver/5878/branches/1.2-stable/lib/tasks/locales.rake END extract_fixtures.rake K 25 svn:wc:ra_dav:version-url -V 54 -/svn/!svn/ver/67/trunk/lib/tasks/extract_fixtures.rake -END -reminder.rake -K 25 -svn:wc:ra_dav:version-url -V 48 -/svn/!svn/ver/4167/trunk/lib/tasks/reminder.rake +V 70 +/svn/!svn/ver/6105/branches/1.2-stable/lib/tasks/extract_fixtures.rake END initializers.rake K 25 svn:wc:ra_dav:version-url -V 52 -/svn/!svn/ver/4405/trunk/lib/tasks/initializers.rake -END -metrics.rake -K 25 -svn:wc:ra_dav:version-url -V 47 -/svn/!svn/ver/2825/trunk/lib/tasks/metrics.rake -END -permissions.rake -K 25 -svn:wc:ra_dav:version-url -V 51 -/svn/!svn/ver/3948/trunk/lib/tasks/permissions.rake -END -load_default_data.rake -K 25 -svn:wc:ra_dav:version-url -V 57 -/svn/!svn/ver/2592/trunk/lib/tasks/load_default_data.rake -END -testing.rake -K 25 -svn:wc:ra_dav:version-url -V 47 -/svn/!svn/ver/3060/trunk/lib/tasks/testing.rake -END -watchers.rake -K 25 -svn:wc:ra_dav:version-url -V 48 -/svn/!svn/ver/3167/trunk/lib/tasks/watchers.rake -END -yardoc.rake -K 25 -svn:wc:ra_dav:version-url -V 46 -/svn/!svn/ver/3922/trunk/lib/tasks/yardoc.rake -END -plugins.rake -K 25 -svn:wc:ra_dav:version-url -V 47 -/svn/!svn/ver/1786/trunk/lib/tasks/plugins.rake -END -locales.rake -K 25 -svn:wc:ra_dav:version-url -V 47 -/svn/!svn/ver/4254/trunk/lib/tasks/locales.rake -END -migrate_from_trac.rake -K 25 -svn:wc:ra_dav:version-url -V 57 -/svn/!svn/ver/3517/trunk/lib/tasks/migrate_from_trac.rake -END -migrate_from_mantis.rake -K 25 -svn:wc:ra_dav:version-url -V 59 -/svn/!svn/ver/4403/trunk/lib/tasks/migrate_from_mantis.rake +V 66 +/svn/!svn/ver/6105/branches/1.2-stable/lib/tasks/initializers.rake END email.rake K 25 svn:wc:ra_dav:version-url -V 45 -/svn/!svn/ver/4256/trunk/lib/tasks/email.rake +V 59 +/svn/!svn/ver/5943/branches/1.2-stable/lib/tasks/email.rake END -migrate_plugins.rake -K 25 -svn:wc:ra_dav:version-url -V 54 -/svn/!svn/ver/752/trunk/lib/tasks/migrate_plugins.rake -END -ci.rake -K 25 -svn:wc:ra_dav:version-url -V 42 -/svn/!svn/ver/3919/trunk/lib/tasks/ci.rake -END -fetch_changesets.rake -K 25 -svn:wc:ra_dav:version-url -V 56 -/svn/!svn/ver/1155/trunk/lib/tasks/fetch_changesets.rake -END