comparison app/views/timelog/.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 cd2282d2aa55 cbce1fd3b1b7
children
comparison
equal deleted inserted replaced
252:adc8466df404 442:753f1380d6bc
1 K 25
2 svn:wc:ra_dav:version-url
3 V 42
4 /svn/!svn/ver/4466/trunk/app/views/timelog
5 END
6 _list.rhtml
7 K 25
8 svn:wc:ra_dav:version-url
9 V 54
10 /svn/!svn/ver/4250/trunk/app/views/timelog/_list.rhtml
11 END
12 index.html.erb
13 K 25
14 svn:wc:ra_dav:version-url
15 V 57
16 /svn/!svn/ver/4239/trunk/app/views/timelog/index.html.erb
17 END
18 index.api.rsb
19 K 25 1 K 25
20 svn:wc:ra_dav:version-url 2 svn:wc:ra_dav:version-url
21 V 56 3 V 56
22 /svn/!svn/ver/4466/trunk/app/views/timelog/index.api.rsb 4 /svn/!svn/ver/5946/branches/1.2-stable/app/views/timelog
23 END 5 END
24 edit.rhtml
25 K 25
26 svn:wc:ra_dav:version-url
27 V 53
28 /svn/!svn/ver/4248/trunk/app/views/timelog/edit.rhtml
29 END
30 _date_range.rhtml
31 K 25
32 svn:wc:ra_dav:version-url
33 V 60
34 /svn/!svn/ver/4235/trunk/app/views/timelog/_date_range.rhtml
35 END
36 show.api.rsb
37 K 25
38 svn:wc:ra_dav:version-url
39 V 55
40 /svn/!svn/ver/4466/trunk/app/views/timelog/show.api.rsb
41 END