diff app/controllers/.svn/all-wcprops @ 246:eeebe205a056 cannam

* Merge from default branch, bringing us up to SVN trunk rev 4993

--- a/app/controllers/.svn/all-wcprops	Thu Jan 20 09:59:02 2011 +0000
+++ b/app/controllers/.svn/all-wcprops	Thu Mar 03 12:02:03 2011 +0000
@@ -1,13 +1,13 @@
 K 25
 svn:wc:ra_dav:version-url
 V 40
-/svn/!svn/ver/4729/trunk/app/controllers
+/svn/!svn/ver/4954/trunk/app/controllers
 END
 issues_controller.rb
 K 25
 svn:wc:ra_dav:version-url
 V 61
-/svn/!svn/ver/4652/trunk/app/controllers/issues_controller.rb
+/svn/!svn/ver/4741/trunk/app/controllers/issues_controller.rb
 END
 queries_controller.rb
 K 25
@@ -57,29 +57,23 @@
 V 62
 /svn/!svn/ver/3784/trunk/app/controllers/members_controller.rb
 END
+context_menus_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 68
+/svn/!svn/ver/4580/trunk/app/controllers/context_menus_controller.rb
+END
 welcome_controller.rb
 K 25
 svn:wc:ra_dav:version-url
 V 62
 /svn/!svn/ver/2941/trunk/app/controllers/welcome_controller.rb
 END
-context_menus_controller.rb
-K 25
-svn:wc:ra_dav:version-url
-V 68
-/svn/!svn/ver/4580/trunk/app/controllers/context_menus_controller.rb
-END
 journals_controller.rb
 K 25
 svn:wc:ra_dav:version-url
 V 63
-/svn/!svn/ver/4535/trunk/app/controllers/journals_controller.rb
-END
-workflows_controller.rb
-K 25
-svn:wc:ra_dav:version-url
-V 64
-/svn/!svn/ver/3536/trunk/app/controllers/workflows_controller.rb
+/svn/!svn/ver/4954/trunk/app/controllers/journals_controller.rb
 END
 time_entry_reports_controller.rb
 K 25
@@ -87,6 +81,12 @@
 V 73
 /svn/!svn/ver/4232/trunk/app/controllers/time_entry_reports_controller.rb
 END
+workflows_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 64
+/svn/!svn/ver/4895/trunk/app/controllers/workflows_controller.rb
+END
 reports_controller.rb
 K 25
 svn:wc:ra_dav:version-url
@@ -105,18 +105,18 @@
 V 68
 /svn/!svn/ver/3627/trunk/app/controllers/custom_fields_controller.rb
 END
+settings_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 63
+/svn/!svn/ver/4432/trunk/app/controllers/settings_controller.rb
+END
 timelog_controller.rb
 K 25
 svn:wc:ra_dav:version-url
 V 62
 /svn/!svn/ver/4511/trunk/app/controllers/timelog_controller.rb
 END
-settings_controller.rb
-K 25
-svn:wc:ra_dav:version-url
-V 63
-/svn/!svn/ver/4432/trunk/app/controllers/settings_controller.rb
-END
 issue_moves_controller.rb
 K 25
 svn:wc:ra_dav:version-url
@@ -147,18 +147,18 @@
 V 63
 /svn/!svn/ver/4174/trunk/app/controllers/previews_controller.rb
 END
+ldap_auth_sources_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 72
+/svn/!svn/ver/3744/trunk/app/controllers/ldap_auth_sources_controller.rb
+END
 auth_sources_controller.rb
 K 25
 svn:wc:ra_dav:version-url
 V 67
 /svn/!svn/ver/3744/trunk/app/controllers/auth_sources_controller.rb
 END
-ldap_auth_sources_controller.rb
-K 25
-svn:wc:ra_dav:version-url
-V 72
-/svn/!svn/ver/3744/trunk/app/controllers/ldap_auth_sources_controller.rb
-END
 search_controller.rb
 K 25
 svn:wc:ra_dav:version-url
@@ -171,18 +171,18 @@
 V 63
 /svn/!svn/ver/3528/trunk/app/controllers/messages_controller.rb
 END
+issue_relations_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 70
+/svn/!svn/ver/4764/trunk/app/controllers/issue_relations_controller.rb
+END
 versions_controller.rb
 K 25
 svn:wc:ra_dav:version-url
 V 63
 /svn/!svn/ver/4354/trunk/app/controllers/versions_controller.rb
 END
-issue_relations_controller.rb
-K 25
-svn:wc:ra_dav:version-url
-V 70
-/svn/!svn/ver/3591/trunk/app/controllers/issue_relations_controller.rb
-END
 boards_controller.rb
 K 25
 svn:wc:ra_dav:version-url
@@ -235,7 +235,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 67
-/svn/!svn/ver/4711/trunk/app/controllers/repositories_controller.rb
+/svn/!svn/ver/4860/trunk/app/controllers/repositories_controller.rb
 END
 admin_controller.rb
 K 25
@@ -253,7 +253,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 62
-/svn/!svn/ver/3906/trunk/app/controllers/account_controller.rb
+/svn/!svn/ver/4757/trunk/app/controllers/account_controller.rb
 END
 calendars_controller.rb
 K 25