diff app/models/.svn/all-wcprops @ 129:5e974759e8b2 cannam

Merge from the default branch

--- a/app/models/.svn/all-wcprops	Wed Jan 19 13:27:01 2011 +0000
+++ b/app/models/.svn/all-wcprops	Wed Jan 19 15:15:02 2011 +0000
@@ -1,7 +1,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 35
-/svn/!svn/ver/4704/trunk/app/models
+/svn/!svn/ver/4730/trunk/app/models
 END
 document.rb
 K 25
@@ -19,13 +19,13 @@
 K 25
 svn:wc:ra_dav:version-url
 V 49
-/svn/!svn/ver/4703/trunk/app/models/repository.rb
+/svn/!svn/ver/4712/trunk/app/models/repository.rb
 END
 time_entry.rb
 K 25
 svn:wc:ra_dav:version-url
 V 49
-/svn/!svn/ver/4277/trunk/app/models/time_entry.rb
+/svn/!svn/ver/4708/trunk/app/models/time_entry.rb
 END
 token.rb
 K 25
@@ -81,6 +81,12 @@
 V 50
 /svn/!svn/ver/3240/trunk/app/models/enumeration.rb
 END
+issue.rb
+K 25
+svn:wc:ra_dav:version-url
+V 44
+/svn/!svn/ver/4723/trunk/app/models/issue.rb
+END
 time_entry_activity_custom_field.rb
 K 25
 svn:wc:ra_dav:version-url
@@ -93,12 +99,6 @@
 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/4491/trunk/app/models/issue.rb
-END
 issue_priority.rb
 K 25
 svn:wc:ra_dav:version-url
@@ -111,17 +111,23 @@
 V 55
 /svn/!svn/ver/3169/trunk/app/models/message_observer.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
 K 25
 svn:wc:ra_dav:version-url
 V 46
 /svn/!svn/ver/3167/trunk/app/models/watcher.rb
 END
-wiki_content.rb
+wiki_page.rb
 K 25
 svn:wc:ra_dav:version-url
-V 51
-/svn/!svn/ver/4296/trunk/app/models/wiki_content.rb
+V 48
+/svn/!svn/ver/4296/trunk/app/models/wiki_page.rb
 END
 enabled_module.rb
 K 25
@@ -129,12 +135,6 @@
 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
 comment.rb
 K 25
 svn:wc:ra_dav:version-url
@@ -171,18 +171,18 @@
 V 45
 /svn/!svn/ver/4373/trunk/app/models/mailer.rb
 END
+workflow.rb
+K 25
+svn:wc:ra_dav:version-url
+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
-workflow.rb
-K 25
-svn:wc:ra_dav:version-url
-V 47
-/svn/!svn/ver/3709/trunk/app/models/workflow.rb
-END
 user_custom_field.rb
 K 25
 svn:wc:ra_dav:version-url
@@ -211,7 +211,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 43
-/svn/!svn/ver/4599/trunk/app/models/user.rb
+/svn/!svn/ver/4730/trunk/app/models/user.rb
 END
 auth_source.rb
 K 25