diff app/views/news/.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).

--- a/app/views/news/.svn/all-wcprops	Thu Jan 13 13:21:03 2011 +0000
+++ b/app/views/news/.svn/all-wcprops	Thu Jan 13 14:33:08 2011 +0000
@@ -1,17 +1,47 @@
 K 25
 svn:wc:ra_dav:version-url
-V 53
-/svn/!svn/ver/4585/branches/1.1-stable/app/views/news
+V 39
+/svn/!svn/ver/4505/trunk/app/views/news
+END
+_news.rhtml
+K 25
+svn:wc:ra_dav:version-url
+V 51
+/svn/!svn/ver/4214/trunk/app/views/news/_news.rhtml
 END
 index.api.rsb
 K 25
 svn:wc:ra_dav:version-url
-V 67
-/svn/!svn/ver/4585/branches/1.1-stable/app/views/news/index.api.rsb
+V 53
+/svn/!svn/ver/4505/trunk/app/views/news/index.api.rsb
 END
 show.rhtml
 K 25
 svn:wc:ra_dav:version-url
-V 64
-/svn/!svn/ver/4585/branches/1.1-stable/app/views/news/show.rhtml
+V 50
+/svn/!svn/ver/4412/trunk/app/views/news/show.rhtml
 END
+_form.rhtml
+K 25
+svn:wc:ra_dav:version-url
+V 50
+/svn/!svn/ver/750/trunk/app/views/news/_form.rhtml
+END
+edit.rhtml
+K 25
+svn:wc:ra_dav:version-url
+V 50
+/svn/!svn/ver/4214/trunk/app/views/news/edit.rhtml
+END
+index.rhtml
+K 25
+svn:wc:ra_dav:version-url
+V 51
+/svn/!svn/ver/4267/trunk/app/views/news/index.rhtml
+END
+new.rhtml
+K 25
+svn:wc:ra_dav:version-url
+V 49
+/svn/!svn/ver/4214/trunk/app/views/news/new.rhtml
+END