comparison config/.svn/all-wcprops @ 120:cd2282d2aa55 cannam

Merge from the default branch. Note that this is not a valid SVN repository any more (use default, redmine-1.1 etc for SVN updates).
author Chris Cannam
date Thu, 13 Jan 2011 14:33:08 +0000
parents af80e5618e9b 8661b858af72
children 5e974759e8b2
comparison
equal deleted inserted replaced
118:b859cc0c4fa1 120:cd2282d2aa55
1 K 25 1 K 25
2 svn:wc:ra_dav:version-url 2 svn:wc:ra_dav:version-url
3 V 45 3 V 31
4 /svn/!svn/ver/4658/branches/1.1-stable/config 4 /svn/!svn/ver/4701/trunk/config
5 END 5 END
6 settings.yml 6 settings.yml
7 K 25 7 K 25
8 svn:wc:ra_dav:version-url 8 svn:wc:ra_dav:version-url
9 V 58 9 V 44
10 /svn/!svn/ver/4585/branches/1.1-stable/config/settings.yml 10 /svn/!svn/ver/4513/trunk/config/settings.yml
11 END
12 email.yml.example
13 K 25
14 svn:wc:ra_dav:version-url
15 V 49
16 /svn/!svn/ver/3448/trunk/config/email.yml.example
17 END
18 routes.rb
19 K 25
20 svn:wc:ra_dav:version-url
21 V 41
22 /svn/!svn/ver/4372/trunk/config/routes.rb
11 END 23 END
12 boot.rb 24 boot.rb
13 K 25 25 K 25
14 svn:wc:ra_dav:version-url 26 svn:wc:ra_dav:version-url
15 V 53 27 V 39
16 /svn/!svn/ver/4585/branches/1.1-stable/config/boot.rb 28 /svn/!svn/ver/4516/trunk/config/boot.rb
17 END 29 END
30 environment.rb
31 K 25
32 svn:wc:ra_dav:version-url
33 V 46
34 /svn/!svn/ver/3372/trunk/config/environment.rb
35 END
36 additional_environment.rb.example
37 K 25
38 svn:wc:ra_dav:version-url
39 V 65
40 /svn/!svn/ver/3018/trunk/config/additional_environment.rb.example
41 END
42 database.yml.example
43 K 25
44 svn:wc:ra_dav:version-url
45 V 52
46 /svn/!svn/ver/3564/trunk/config/database.yml.example
47 END