diff app/views/timelog/.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/timelog/.svn/all-wcprops	Thu Jan 13 13:21:03 2011 +0000
+++ b/app/views/timelog/.svn/all-wcprops	Thu Jan 13 14:33:08 2011 +0000
@@ -1,17 +1,41 @@
 K 25
 svn:wc:ra_dav:version-url
-V 56
-/svn/!svn/ver/4585/branches/1.1-stable/app/views/timelog
+V 42
+/svn/!svn/ver/4466/trunk/app/views/timelog
+END
+_list.rhtml
+K 25
+svn:wc:ra_dav:version-url
+V 54
+/svn/!svn/ver/4250/trunk/app/views/timelog/_list.rhtml
+END
+index.html.erb
+K 25
+svn:wc:ra_dav:version-url
+V 57
+/svn/!svn/ver/4239/trunk/app/views/timelog/index.html.erb
 END
 index.api.rsb
 K 25
 svn:wc:ra_dav:version-url
-V 70
-/svn/!svn/ver/4585/branches/1.1-stable/app/views/timelog/index.api.rsb
+V 56
+/svn/!svn/ver/4466/trunk/app/views/timelog/index.api.rsb
+END
+edit.rhtml
+K 25
+svn:wc:ra_dav:version-url
+V 53
+/svn/!svn/ver/4248/trunk/app/views/timelog/edit.rhtml
+END
+_date_range.rhtml
+K 25
+svn:wc:ra_dav:version-url
+V 60
+/svn/!svn/ver/4235/trunk/app/views/timelog/_date_range.rhtml
 END
 show.api.rsb
 K 25
 svn:wc:ra_dav:version-url
-V 69
-/svn/!svn/ver/4585/branches/1.1-stable/app/views/timelog/show.api.rsb
+V 55
+/svn/!svn/ver/4466/trunk/app/views/timelog/show.api.rsb
 END