comparison config/.svn/all-wcprops @ 442:753f1380d6bc cannam

Merge from branch "redmine-1.2"
author Chris Cannam
date Mon, 06 Jun 2011 14:41:04 +0100
parents eeebe205a056 cbce1fd3b1b7
children 851510f1b535
comparison
equal deleted inserted replaced
252:adc8466df404 442:753f1380d6bc
1 K 25 1 K 25
2 svn:wc:ra_dav:version-url 2 svn:wc:ra_dav:version-url
3 V 31 3 V 45
4 /svn/!svn/ver/4955/trunk/config 4 /svn/!svn/ver/5998/branches/1.2-stable/config
5 END
6 settings.yml
7 K 25
8 svn:wc:ra_dav:version-url
9 V 44
10 /svn/!svn/ver/4513/trunk/config/settings.yml
11 END
12 configuration.yml.example
13 K 25
14 svn:wc:ra_dav:version-url
15 V 57
16 /svn/!svn/ver/4950/trunk/config/configuration.yml.example
17 END 5 END
18 routes.rb 6 routes.rb
19 K 25 7 K 25
20 svn:wc:ra_dav:version-url 8 svn:wc:ra_dav:version-url
21 V 41 9 V 55
22 /svn/!svn/ver/4729/trunk/config/routes.rb 10 /svn/!svn/ver/5878/branches/1.2-stable/config/routes.rb
23 END
24 boot.rb
25 K 25
26 svn:wc:ra_dav:version-url
27 V 39
28 /svn/!svn/ver/4516/trunk/config/boot.rb
29 END 11 END
30 environment.rb 12 environment.rb
31 K 25 13 K 25
32 svn:wc:ra_dav:version-url 14 svn:wc:ra_dav:version-url
33 V 46 15 V 60
34 /svn/!svn/ver/4904/trunk/config/environment.rb 16 /svn/!svn/ver/5878/branches/1.2-stable/config/environment.rb
35 END 17 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/4753/trunk/config/database.yml.example
47 END