diff test/functional/.svn/all-wcprops @ 246:eeebe205a056 cannam

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

--- a/test/functional/.svn/all-wcprops	Thu Jan 20 09:59:02 2011 +0000
+++ b/test/functional/.svn/all-wcprops	Thu Mar 03 12:02:03 2011 +0000
@@ -1,7 +1,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 40
-/svn/!svn/ver/4729/trunk/test/functional
+/svn/!svn/ver/4982/trunk/test/functional
 END
 issues_controller_test.rb
 K 25
@@ -69,18 +69,18 @@
 V 65
 /svn/!svn/ver/4509/trunk/test/functional/admin_controller_test.rb
 END
-welcome_controller_test.rb
-K 25
-svn:wc:ra_dav:version-url
-V 67
-/svn/!svn/ver/4509/trunk/test/functional/welcome_controller_test.rb
-END
 context_menus_controller_test.rb
 K 25
 svn:wc:ra_dav:version-url
 V 73
 /svn/!svn/ver/4673/trunk/test/functional/context_menus_controller_test.rb
 END
+welcome_controller_test.rb
+K 25
+svn:wc:ra_dav:version-url
+V 67
+/svn/!svn/ver/4900/trunk/test/functional/welcome_controller_test.rb
+END
 account_controller_test.rb
 K 25
 svn:wc:ra_dav:version-url
@@ -93,6 +93,12 @@
 V 69
 /svn/!svn/ver/4509/trunk/test/functional/calendars_controller_test.rb
 END
+journals_controller_test.rb
+K 25
+svn:wc:ra_dav:version-url
+V 68
+/svn/!svn/ver/4954/trunk/test/functional/journals_controller_test.rb
+END
 time_entry_reports_controller_test.rb
 K 25
 svn:wc:ra_dav:version-url
@@ -103,13 +109,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 69
-/svn/!svn/ver/4509/trunk/test/functional/workflows_controller_test.rb
-END
-journals_controller_test.rb
-K 25
-svn:wc:ra_dav:version-url
-V 68
-/svn/!svn/ver/4535/trunk/test/functional/journals_controller_test.rb
+/svn/!svn/ver/4895/trunk/test/functional/workflows_controller_test.rb
 END
 project_enumerations_controller_test.rb
 K 25
@@ -139,7 +139,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 76
-/svn/!svn/ver/4577/trunk/test/functional/repositories_cvs_controller_test.rb
+/svn/!svn/ver/4982/trunk/test/functional/repositories_cvs_controller_test.rb
 END
 application_controller_test.rb
 K 25
@@ -165,18 +165,18 @@
 V 66
 /svn/!svn/ver/4509/trunk/test/functional/search_controller_test.rb
 END
-repositories_bazaar_controller_test.rb
-K 25
-svn:wc:ra_dav:version-url
-V 79
-/svn/!svn/ver/4509/trunk/test/functional/repositories_bazaar_controller_test.rb
-END
 messages_controller_test.rb
 K 25
 svn:wc:ra_dav:version-url
 V 68
 /svn/!svn/ver/4509/trunk/test/functional/messages_controller_test.rb
 END
+repositories_bazaar_controller_test.rb
+K 25
+svn:wc:ra_dav:version-url
+V 79
+/svn/!svn/ver/4982/trunk/test/functional/repositories_bazaar_controller_test.rb
+END
 attachments_controller_test.rb
 K 25
 svn:wc:ra_dav:version-url
@@ -225,23 +225,23 @@
 V 68
 /svn/!svn/ver/4647/trunk/test/functional/projects_controller_test.rb
 END
-repositories_git_controller_test.rb
-K 25
-svn:wc:ra_dav:version-url
-V 76
-/svn/!svn/ver/4713/trunk/test/functional/repositories_git_controller_test.rb
-END
 members_controller_test.rb
 K 25
 svn:wc:ra_dav:version-url
 V 67
 /svn/!svn/ver/4509/trunk/test/functional/members_controller_test.rb
 END
+repositories_git_controller_test.rb
+K 25
+svn:wc:ra_dav:version-url
+V 76
+/svn/!svn/ver/4734/trunk/test/functional/repositories_git_controller_test.rb
+END
 repositories_mercurial_controller_test.rb
 K 25
 svn:wc:ra_dav:version-url
 V 82
-/svn/!svn/ver/4718/trunk/test/functional/repositories_mercurial_controller_test.rb
+/svn/!svn/ver/4855/trunk/test/functional/repositories_mercurial_controller_test.rb
 END
 issue_categories_controller_test.rb
 K 25
@@ -289,7 +289,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 78
-/svn/!svn/ver/4509/trunk/test/functional/repositories_darcs_controller_test.rb
+/svn/!svn/ver/4982/trunk/test/functional/repositories_darcs_controller_test.rb
 END
 wiki_controller_test.rb
 K 25
@@ -297,29 +297,29 @@
 V 64
 /svn/!svn/ver/4509/trunk/test/functional/wiki_controller_test.rb
 END
+previews_controller_test.rb
+K 25
+svn:wc:ra_dav:version-url
+V 68
+/svn/!svn/ver/4509/trunk/test/functional/previews_controller_test.rb
+END
 auth_sources_controller_test.rb
 K 25
 svn:wc:ra_dav:version-url
 V 72
 /svn/!svn/ver/4509/trunk/test/functional/auth_sources_controller_test.rb
 END
-previews_controller_test.rb
-K 25
-svn:wc:ra_dav:version-url
-V 68
-/svn/!svn/ver/4509/trunk/test/functional/previews_controller_test.rb
-END
 repositories_subversion_controller_test.rb
 K 25
 svn:wc:ra_dav:version-url
 V 83
-/svn/!svn/ver/4710/trunk/test/functional/repositories_subversion_controller_test.rb
+/svn/!svn/ver/4896/trunk/test/functional/repositories_subversion_controller_test.rb
 END
 issue_relations_controller_test.rb
 K 25
 svn:wc:ra_dav:version-url
 V 75
-/svn/!svn/ver/4509/trunk/test/functional/issue_relations_controller_test.rb
+/svn/!svn/ver/4764/trunk/test/functional/issue_relations_controller_test.rb
 END
 versions_controller_test.rb
 K 25