Mercurial > hg > soundsoftware-site
diff app/views/wiki/.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 | eeebe205a056 |
line wrap: on
line diff
--- a/app/views/wiki/.svn/all-wcprops Thu Jan 13 13:21:03 2011 +0000 +++ b/app/views/wiki/.svn/all-wcprops Thu Jan 13 14:33:08 2011 +0000 @@ -1,17 +1,83 @@ K 25 svn:wc:ra_dav:version-url -V 53 -/svn/!svn/ver/4660/branches/1.1-stable/app/views/wiki +V 39 +/svn/!svn/ver/4651/trunk/app/views/wiki +END +export_multiple.rhtml +K 25 +svn:wc:ra_dav:version-url +V 61 +/svn/!svn/ver/3026/trunk/app/views/wiki/export_multiple.rhtml +END +index.html.erb +K 25 +svn:wc:ra_dav:version-url +V 54 +/svn/!svn/ver/4290/trunk/app/views/wiki/index.html.erb +END +show.rhtml +K 25 +svn:wc:ra_dav:version-url +V 50 +/svn/!svn/ver/4303/trunk/app/views/wiki/show.rhtml +END +export.rhtml +K 25 +svn:wc:ra_dav:version-url +V 52 +/svn/!svn/ver/3026/trunk/app/views/wiki/export.rhtml END history.rhtml K 25 svn:wc:ra_dav:version-url -V 67 -/svn/!svn/ver/4660/branches/1.1-stable/app/views/wiki/history.rhtml +V 53 +/svn/!svn/ver/4651/trunk/app/views/wiki/history.rhtml +END +edit.rhtml +K 25 +svn:wc:ra_dav:version-url +V 50 +/svn/!svn/ver/4303/trunk/app/views/wiki/edit.rhtml +END +rename.rhtml +K 25 +svn:wc:ra_dav:version-url +V 52 +/svn/!svn/ver/4375/trunk/app/views/wiki/rename.rhtml +END +_sidebar.rhtml +K 25 +svn:wc:ra_dav:version-url +V 54 +/svn/!svn/ver/4296/trunk/app/views/wiki/_sidebar.rhtml END diff.rhtml K 25 svn:wc:ra_dav:version-url -V 64 -/svn/!svn/ver/4585/branches/1.1-stable/app/views/wiki/diff.rhtml +V 50 +/svn/!svn/ver/4551/trunk/app/views/wiki/diff.rhtml END +_content.rhtml +K 25 +svn:wc:ra_dav:version-url +V 53 +/svn/!svn/ver/897/trunk/app/views/wiki/_content.rhtml +END +annotate.rhtml +K 25 +svn:wc:ra_dav:version-url +V 54 +/svn/!svn/ver/4296/trunk/app/views/wiki/annotate.rhtml +END +destroy.rhtml +K 25 +svn:wc:ra_dav:version-url +V 53 +/svn/!svn/ver/4296/trunk/app/views/wiki/destroy.rhtml +END +date_index.html.erb +K 25 +svn:wc:ra_dav:version-url +V 59 +/svn/!svn/ver/4303/trunk/app/views/wiki/date_index.html.erb +END