diff app/controllers/.svn/all-wcprops @ 508:851510f1b535 cannam

Merge from branch "redmine-1.2"

--- a/app/controllers/.svn/all-wcprops	Thu Jul 14 10:21:43 2011 +0100
+++ b/app/controllers/.svn/all-wcprops	Thu Jul 14 10:37:36 2011 +0100
@@ -1,5 +1,77 @@
 K 25
 svn:wc:ra_dav:version-url
 V 54
-/svn/!svn/ver/5946/branches/1.2-stable/app/controllers
+/svn/!svn/ver/6209/branches/1.2-stable/app/controllers
 END
+boards_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 75
+/svn/!svn/ver/6198/branches/1.2-stable/app/controllers/boards_controller.rb
+END
+issues_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 75
+/svn/!svn/ver/6198/branches/1.2-stable/app/controllers/issues_controller.rb
+END
+news_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 73
+/svn/!svn/ver/6198/branches/1.2-stable/app/controllers/news_controller.rb
+END
+journals_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 77
+/svn/!svn/ver/6198/branches/1.2-stable/app/controllers/journals_controller.rb
+END
+timelog_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 76
+/svn/!svn/ver/6198/branches/1.2-stable/app/controllers/timelog_controller.rb
+END
+users_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 74
+/svn/!svn/ver/6198/branches/1.2-stable/app/controllers/users_controller.rb
+END
+application_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 80
+/svn/!svn/ver/6209/branches/1.2-stable/app/controllers/application_controller.rb
+END
+activities_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 79
+/svn/!svn/ver/6198/branches/1.2-stable/app/controllers/activities_controller.rb
+END
+search_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 75
+/svn/!svn/ver/6202/branches/1.2-stable/app/controllers/search_controller.rb
+END
+repositories_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 81
+/svn/!svn/ver/6198/branches/1.2-stable/app/controllers/repositories_controller.rb
+END
+issue_relations_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 84
+/svn/!svn/ver/6198/branches/1.2-stable/app/controllers/issue_relations_controller.rb
+END
+projects_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 77
+/svn/!svn/ver/6198/branches/1.2-stable/app/controllers/projects_controller.rb
+END