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

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

--- a/app/models/.svn/all-wcprops	Thu Jan 20 09:59:02 2011 +0000
+++ b/app/models/.svn/all-wcprops	Thu Mar 03 12:02:03 2011 +0000
@@ -1,25 +1,25 @@
 K 25
 svn:wc:ra_dav:version-url
 V 35
-/svn/!svn/ver/4730/trunk/app/models
+/svn/!svn/ver/4982/trunk/app/models
 END
 document.rb
 K 25
 svn:wc:ra_dav:version-url
 V 47
-/svn/!svn/ver/3358/trunk/app/models/document.rb
+/svn/!svn/ver/4759/trunk/app/models/document.rb
 END
 mail_handler.rb
 K 25
 svn:wc:ra_dav:version-url
 V 51
-/svn/!svn/ver/4682/trunk/app/models/mail_handler.rb
+/svn/!svn/ver/4820/trunk/app/models/mail_handler.rb
 END
 repository.rb
 K 25
 svn:wc:ra_dav:version-url
 V 49
-/svn/!svn/ver/4712/trunk/app/models/repository.rb
+/svn/!svn/ver/4982/trunk/app/models/repository.rb
 END
 time_entry.rb
 K 25
@@ -43,7 +43,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 55
-/svn/!svn/ver/3492/trunk/app/models/auth_source_ldap.rb
+/svn/!svn/ver/4950/trunk/app/models/auth_source_ldap.rb
 END
 principal.rb
 K 25
@@ -81,11 +81,17 @@
 V 50
 /svn/!svn/ver/3240/trunk/app/models/enumeration.rb
 END
+member_role.rb
+K 25
+svn:wc:ra_dav:version-url
+V 50
+/svn/!svn/ver/3250/trunk/app/models/member_role.rb
+END
 issue.rb
 K 25
 svn:wc:ra_dav:version-url
 V 44
-/svn/!svn/ver/4723/trunk/app/models/issue.rb
+/svn/!svn/ver/4954/trunk/app/models/issue.rb
 END
 time_entry_activity_custom_field.rb
 K 25
@@ -93,12 +99,6 @@
 V 71
 /svn/!svn/ver/2952/trunk/app/models/time_entry_activity_custom_field.rb
 END
-member_role.rb
-K 25
-svn:wc:ra_dav:version-url
-V 50
-/svn/!svn/ver/3250/trunk/app/models/member_role.rb
-END
 issue_priority.rb
 K 25
 svn:wc:ra_dav:version-url
@@ -111,29 +111,29 @@
 V 55
 /svn/!svn/ver/3169/trunk/app/models/message_observer.rb
 END
+watcher.rb
+K 25
+svn:wc:ra_dav:version-url
+V 46
+/svn/!svn/ver/3167/trunk/app/models/watcher.rb
+END
 wiki_content.rb
 K 25
 svn:wc:ra_dav:version-url
 V 51
 /svn/!svn/ver/4296/trunk/app/models/wiki_content.rb
 END
-watcher.rb
+enabled_module.rb
 K 25
 svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/3167/trunk/app/models/watcher.rb
+V 53
+/svn/!svn/ver/2970/trunk/app/models/enabled_module.rb
 END
 wiki_page.rb
 K 25
 svn:wc:ra_dav:version-url
 V 48
-/svn/!svn/ver/4296/trunk/app/models/wiki_page.rb
-END
-enabled_module.rb
-K 25
-svn:wc:ra_dav:version-url
-V 53
-/svn/!svn/ver/2970/trunk/app/models/enabled_module.rb
+/svn/!svn/ver/4952/trunk/app/models/wiki_page.rb
 END
 comment.rb
 K 25
@@ -151,7 +151,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 44
-/svn/!svn/ver/4553/trunk/app/models/query.rb
+/svn/!svn/ver/4888/trunk/app/models/query.rb
 END
 member.rb
 K 25
@@ -169,7 +169,13 @@
 K 25
 svn:wc:ra_dav:version-url
 V 45
-/svn/!svn/ver/4373/trunk/app/models/mailer.rb
+/svn/!svn/ver/4752/trunk/app/models/mailer.rb
+END
+journal.rb
+K 25
+svn:wc:ra_dav:version-url
+V 46
+/svn/!svn/ver/4062/trunk/app/models/journal.rb
 END
 workflow.rb
 K 25
@@ -177,12 +183,6 @@
 V 47
 /svn/!svn/ver/3709/trunk/app/models/workflow.rb
 END
-journal.rb
-K 25
-svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4062/trunk/app/models/journal.rb
-END
 user_custom_field.rb
 K 25
 svn:wc:ra_dav:version-url
@@ -205,19 +205,19 @@
 K 25
 svn:wc:ra_dav:version-url
 V 46
-/svn/!svn/ver/3417/trunk/app/models/setting.rb
+/svn/!svn/ver/4899/trunk/app/models/setting.rb
 END
 user.rb
 K 25
 svn:wc:ra_dav:version-url
 V 43
-/svn/!svn/ver/4730/trunk/app/models/user.rb
+/svn/!svn/ver/4936/trunk/app/models/user.rb
 END
 auth_source.rb
 K 25
 svn:wc:ra_dav:version-url
 V 50
-/svn/!svn/ver/3745/trunk/app/models/auth_source.rb
+/svn/!svn/ver/4950/trunk/app/models/auth_source.rb
 END
 news_observer.rb
 K 25
@@ -229,7 +229,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 46
-/svn/!svn/ver/3373/trunk/app/models/message.rb
+/svn/!svn/ver/4759/trunk/app/models/message.rb
 END
 wiki_redirect.rb
 K 25
@@ -271,7 +271,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 49
-/svn/!svn/ver/3774/trunk/app/models/attachment.rb
+/svn/!svn/ver/4755/trunk/app/models/attachment.rb
 END
 group_custom_field.rb
 K 25
@@ -283,7 +283,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 51
-/svn/!svn/ver/4599/trunk/app/models/issue_status.rb
+/svn/!svn/ver/4895/trunk/app/models/issue_status.rb
 END
 time_entry_activity.rb
 K 25
@@ -300,8 +300,8 @@
 journal_detail.rb
 K 25
 svn:wc:ra_dav:version-url
-V 52
-/svn/!svn/ver/478/trunk/app/models/journal_detail.rb
+V 53
+/svn/!svn/ver/4954/trunk/app/models/journal_detail.rb
 END
 group.rb
 K 25
@@ -319,7 +319,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 48
-/svn/!svn/ver/4613/trunk/app/models/changeset.rb
+/svn/!svn/ver/4962/trunk/app/models/changeset.rb
 END
 role.rb
 K 25
@@ -367,5 +367,5 @@
 K 25
 svn:wc:ra_dav:version-url
 V 54
-/svn/!svn/ver/1623/trunk/app/models/user_preference.rb
+/svn/!svn/ver/4900/trunk/app/models/user_preference.rb
 END