Mercurial > hg > soundsoftware-site
comparison app/views/my/.svn/all-wcprops @ 514:7eba09d624db live
Merge
author | Chris Cannam |
---|---|
date | Thu, 14 Jul 2011 10:50:53 +0100 |
parents | cbce1fd3b1b7 |
children |
comparison
equal
deleted
inserted
replaced
512:b9aebdd7dd40 | 514:7eba09d624db |
---|---|
1 K 25 | |
2 svn:wc:ra_dav:version-url | |
3 V 37 | |
4 /svn/!svn/ver/4380/trunk/app/views/my | |
5 END | |
6 account.rhtml | |
7 K 25 | 1 K 25 |
8 svn:wc:ra_dav:version-url | 2 svn:wc:ra_dav:version-url |
9 V 51 | 3 V 51 |
10 /svn/!svn/ver/4223/trunk/app/views/my/account.rhtml | 4 /svn/!svn/ver/5878/branches/1.2-stable/app/views/my |
11 END | 5 END |
12 page.rhtml | |
13 K 25 | |
14 svn:wc:ra_dav:version-url | |
15 V 48 | |
16 /svn/!svn/ver/3542/trunk/app/views/my/page.rhtml | |
17 END | |
18 password.rhtml | |
19 K 25 | |
20 svn:wc:ra_dav:version-url | |
21 V 52 | |
22 /svn/!svn/ver/2678/trunk/app/views/my/password.rhtml | |
23 END | |
24 _sidebar.rhtml | |
25 K 25 | |
26 svn:wc:ra_dav:version-url | |
27 V 52 | |
28 /svn/!svn/ver/3775/trunk/app/views/my/_sidebar.rhtml | |
29 END | |
30 _block.rhtml | |
31 K 25 | |
32 svn:wc:ra_dav:version-url | |
33 V 50 | |
34 /svn/!svn/ver/2528/trunk/app/views/my/_block.rhtml | |
35 END | |
36 page_layout.rhtml | |
37 K 25 | |
38 svn:wc:ra_dav:version-url | |
39 V 55 | |
40 /svn/!svn/ver/4380/trunk/app/views/my/page_layout.rhtml | |
41 END |