diff app/controllers/.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/controllers/.svn/all-wcprops	Thu Jan 13 13:21:03 2011 +0000
+++ b/app/controllers/.svn/all-wcprops	Thu Jan 13 14:33:08 2011 +0000
@@ -1,89 +1,299 @@
 K 25
 svn:wc:ra_dav:version-url
-V 54
-/svn/!svn/ver/4707/branches/1.1-stable/app/controllers
+V 40
+/svn/!svn/ver/4703/trunk/app/controllers
 END
 issues_controller.rb
 K 25
 svn:wc:ra_dav:version-url
-V 75
-/svn/!svn/ver/4653/branches/1.1-stable/app/controllers/issues_controller.rb
+V 61
+/svn/!svn/ver/4652/trunk/app/controllers/issues_controller.rb
+END
+queries_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 62
+/svn/!svn/ver/3684/trunk/app/controllers/queries_controller.rb
+END
+sys_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 58
+/svn/!svn/ver/3201/trunk/app/controllers/sys_controller.rb
+END
+mail_handler_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 67
+/svn/!svn/ver/3202/trunk/app/controllers/mail_handler_controller.rb
+END
+watchers_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 63
+/svn/!svn/ver/3798/trunk/app/controllers/watchers_controller.rb
 END
 auto_completes_controller.rb
 K 25
 svn:wc:ra_dav:version-url
-V 83
-/svn/!svn/ver/4585/branches/1.1-stable/app/controllers/auto_completes_controller.rb
+V 69
+/svn/!svn/ver/4503/trunk/app/controllers/auto_completes_controller.rb
 END
 my_controller.rb
 K 25
 svn:wc:ra_dav:version-url
-V 71
-/svn/!svn/ver/4585/branches/1.1-stable/app/controllers/my_controller.rb
+V 57
+/svn/!svn/ver/4497/trunk/app/controllers/my_controller.rb
+END
+comments_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 63
+/svn/!svn/ver/4172/trunk/app/controllers/comments_controller.rb
+END
+members_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 62
+/svn/!svn/ver/3784/trunk/app/controllers/members_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 82
-/svn/!svn/ver/4585/branches/1.1-stable/app/controllers/context_menus_controller.rb
+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 77
-/svn/!svn/ver/4585/branches/1.1-stable/app/controllers/journals_controller.rb
+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
+END
+time_entry_reports_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 73
+/svn/!svn/ver/4232/trunk/app/controllers/time_entry_reports_controller.rb
+END
+reports_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 62
+/svn/!svn/ver/3692/trunk/app/controllers/reports_controller.rb
+END
+project_enumerations_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 75
+/svn/!svn/ver/4075/trunk/app/controllers/project_enumerations_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 76
-/svn/!svn/ver/4585/branches/1.1-stable/app/controllers/timelog_controller.rb
+V 62
+/svn/!svn/ver/4511/trunk/app/controllers/timelog_controller.rb
 END
-settings_controller.rb
+custom_fields_controller.rb
 K 25
 svn:wc:ra_dav:version-url
-V 77
-/svn/!svn/ver/4585/branches/1.1-stable/app/controllers/settings_controller.rb
+V 68
+/svn/!svn/ver/3627/trunk/app/controllers/custom_fields_controller.rb
 END
 users_controller.rb
 K 25
 svn:wc:ra_dav:version-url
-V 74
-/svn/!svn/ver/4585/branches/1.1-stable/app/controllers/users_controller.rb
+V 60
+/svn/!svn/ver/4544/trunk/app/controllers/users_controller.rb
+END
+issue_moves_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 66
+/svn/!svn/ver/4292/trunk/app/controllers/issue_moves_controller.rb
+END
+files_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 60
+/svn/!svn/ver/4177/trunk/app/controllers/files_controller.rb
 END
 application_controller.rb
 K 25
 svn:wc:ra_dav:version-url
-V 80
-/svn/!svn/ver/4585/branches/1.1-stable/app/controllers/application_controller.rb
+V 66
+/svn/!svn/ver/4573/trunk/app/controllers/application_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
+previews_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 63
+/svn/!svn/ver/4174/trunk/app/controllers/previews_controller.rb
+END
+search_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 61
+/svn/!svn/ver/3806/trunk/app/controllers/search_controller.rb
+END
+messages_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+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/3591/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
+boards_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 61
+/svn/!svn/ver/3942/trunk/app/controllers/boards_controller.rb
+END
+attachments_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 66
+/svn/!svn/ver/3281/trunk/app/controllers/attachments_controller.rb
 END
 news_controller.rb
 K 25
 svn:wc:ra_dav:version-url
-V 73
-/svn/!svn/ver/4585/branches/1.1-stable/app/controllers/news_controller.rb
+V 59
+/svn/!svn/ver/4505/trunk/app/controllers/news_controller.rb
+END
+trackers_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 63
+/svn/!svn/ver/3627/trunk/app/controllers/trackers_controller.rb
+END
+groups_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 61
+/svn/!svn/ver/3934/trunk/app/controllers/groups_controller.rb
+END
+issue_statuses_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 69
+/svn/!svn/ver/3416/trunk/app/controllers/issue_statuses_controller.rb
+END
+roles_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 60
+/svn/!svn/ver/3627/trunk/app/controllers/roles_controller.rb
+END
+wikis_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 60
+/svn/!svn/ver/3370/trunk/app/controllers/wikis_controller.rb
 END
 repositories_controller.rb
 K 25
 svn:wc:ra_dav:version-url
-V 81
-/svn/!svn/ver/4707/branches/1.1-stable/app/controllers/repositories_controller.rb
+V 67
+/svn/!svn/ver/4703/trunk/app/controllers/repositories_controller.rb
+END
+admin_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 60
+/svn/!svn/ver/3200/trunk/app/controllers/admin_controller.rb
 END
 projects_controller.rb
 K 25
 svn:wc:ra_dav:version-url
-V 77
-/svn/!svn/ver/4660/branches/1.1-stable/app/controllers/projects_controller.rb
+V 63
+/svn/!svn/ver/4647/trunk/app/controllers/projects_controller.rb
+END
+account_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 62
+/svn/!svn/ver/3906/trunk/app/controllers/account_controller.rb
+END
+calendars_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 64
+/svn/!svn/ver/4388/trunk/app/controllers/calendars_controller.rb
+END
+issue_categories_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 71
+/svn/!svn/ver/3597/trunk/app/controllers/issue_categories_controller.rb
+END
+gantts_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 61
+/svn/!svn/ver/4388/trunk/app/controllers/gantts_controller.rb
+END
+documents_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 64
+/svn/!svn/ver/3597/trunk/app/controllers/documents_controller.rb
 END
 wiki_controller.rb
 K 25
 svn:wc:ra_dav:version-url
-V 73
-/svn/!svn/ver/4585/branches/1.1-stable/app/controllers/wiki_controller.rb
+V 59
+/svn/!svn/ver/4429/trunk/app/controllers/wiki_controller.rb
 END
 activities_controller.rb
 K 25
 svn:wc:ra_dav:version-url
-V 79
-/svn/!svn/ver/4585/branches/1.1-stable/app/controllers/activities_controller.rb
+V 65
+/svn/!svn/ver/4579/trunk/app/controllers/activities_controller.rb
 END
+enumerations_controller.rb
+K 25
+svn:wc:ra_dav:version-url
+V 67
+/svn/!svn/ver/3524/trunk/app/controllers/enumerations_controller.rb
+END