diff app/models/.svn/all-wcprops @ 23:ca82a3468d27 cannam

* Merge SVN update from default

--- a/app/models/.svn/all-wcprops	Thu Sep 23 16:19:06 2010 +0100
+++ b/app/models/.svn/all-wcprops	Fri Sep 24 14:17:42 2010 +0100
@@ -1,7 +1,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 35
-/svn/!svn/ver/3929/trunk/app/models
+/svn/!svn/ver/4167/trunk/app/models
 END
 document.rb
 K 25
@@ -25,7 +25,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 49
-/svn/!svn/ver/3232/trunk/app/models/time_entry.rb
+/svn/!svn/ver/4087/trunk/app/models/time_entry.rb
 END
 token.rb
 K 25
@@ -49,7 +49,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 48
-/svn/!svn/ver/3678/trunk/app/models/principal.rb
+/svn/!svn/ver/4076/trunk/app/models/principal.rb
 END
 version_custom_field.rb
 K 25
@@ -81,6 +81,12 @@
 V 50
 /svn/!svn/ver/3240/trunk/app/models/enumeration.rb
 END
+time_entry_activity_custom_field.rb
+K 25
+svn:wc:ra_dav:version-url
+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
@@ -91,13 +97,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 44
-/svn/!svn/ver/3821/trunk/app/models/issue.rb
-END
-time_entry_activity_custom_field.rb
-K 25
-svn:wc:ra_dav:version-url
-V 71
-/svn/!svn/ver/2952/trunk/app/models/time_entry_activity_custom_field.rb
+/svn/!svn/ver/4105/trunk/app/models/issue.rb
 END
 issue_priority.rb
 K 25
@@ -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/3632/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/3632/trunk/app/models/wiki_content.rb
+V 48
+/svn/!svn/ver/3632/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/3632/trunk/app/models/wiki_page.rb
-END
 comment.rb
 K 25
 svn:wc:ra_dav:version-url
@@ -151,7 +151,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 44
-/svn/!svn/ver/3927/trunk/app/models/query.rb
+/svn/!svn/ver/4079/trunk/app/models/query.rb
 END
 member.rb
 K 25
@@ -169,13 +169,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 45
-/svn/!svn/ver/3907/trunk/app/models/mailer.rb
-END
-journal.rb
-K 25
-svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/2615/trunk/app/models/journal.rb
+/svn/!svn/ver/4167/trunk/app/models/mailer.rb
 END
 workflow.rb
 K 25
@@ -183,6 +177,12 @@
 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
@@ -211,7 +211,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 43
-/svn/!svn/ver/3906/trunk/app/models/user.rb
+/svn/!svn/ver/4164/trunk/app/models/user.rb
 END
 auth_source.rb
 K 25
@@ -253,7 +253,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 46
-/svn/!svn/ver/3761/trunk/app/models/version.rb
+/svn/!svn/ver/4073/trunk/app/models/version.rb
 END
 issue_priority_custom_field.rb
 K 25
@@ -349,7 +349,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 46
-/svn/!svn/ver/3760/trunk/app/models/project.rb
+/svn/!svn/ver/4087/trunk/app/models/project.rb
 END
 document_category.rb
 K 25