diff app/models/.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/models/.svn/all-wcprops	Thu Jan 13 13:21:03 2011 +0000
+++ b/app/models/.svn/all-wcprops	Thu Jan 13 14:33:08 2011 +0000
@@ -1,83 +1,371 @@
 K 25
 svn:wc:ra_dav:version-url
-V 49
-/svn/!svn/ver/4707/branches/1.1-stable/app/models
+V 35
+/svn/!svn/ver/4704/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
 END
 mail_handler.rb
 K 25
 svn:wc:ra_dav:version-url
-V 65
-/svn/!svn/ver/4585/branches/1.1-stable/app/models/mail_handler.rb
+V 51
+/svn/!svn/ver/4682/trunk/app/models/mail_handler.rb
 END
 repository.rb
 K 25
 svn:wc:ra_dav:version-url
-V 63
-/svn/!svn/ver/4707/branches/1.1-stable/app/models/repository.rb
+V 49
+/svn/!svn/ver/4703/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
+END
+token.rb
+K 25
+svn:wc:ra_dav:version-url
+V 44
+/svn/!svn/ver/2778/trunk/app/models/token.rb
+END
+journal_observer.rb
+K 25
+svn:wc:ra_dav:version-url
+V 55
+/svn/!svn/ver/4221/trunk/app/models/journal_observer.rb
+END
+auth_source_ldap.rb
+K 25
+svn:wc:ra_dav:version-url
+V 55
+/svn/!svn/ver/3492/trunk/app/models/auth_source_ldap.rb
+END
+principal.rb
+K 25
+svn:wc:ra_dav:version-url
+V 48
+/svn/!svn/ver/4076/trunk/app/models/principal.rb
+END
+version_custom_field.rb
+K 25
+svn:wc:ra_dav:version-url
+V 59
+/svn/!svn/ver/3064/trunk/app/models/version_custom_field.rb
+END
+issue_custom_field.rb
+K 25
+svn:wc:ra_dav:version-url
+V 56
+/svn/!svn/ver/337/trunk/app/models/issue_custom_field.rb
+END
+issue_category.rb
+K 25
+svn:wc:ra_dav:version-url
+V 52
+/svn/!svn/ver/955/trunk/app/models/issue_category.rb
+END
+change.rb
+K 25
+svn:wc:ra_dav:version-url
+V 45
+/svn/!svn/ver/3860/trunk/app/models/change.rb
+END
+enumeration.rb
+K 25
+svn:wc:ra_dav:version-url
+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
+V 50
+/svn/!svn/ver/3250/trunk/app/models/member_role.rb
 END
 issue.rb
 K 25
 svn:wc:ra_dav:version-url
-V 58
-/svn/!svn/ver/4585/branches/1.1-stable/app/models/issue.rb
+V 44
+/svn/!svn/ver/4491/trunk/app/models/issue.rb
+END
+issue_priority.rb
+K 25
+svn:wc:ra_dav:version-url
+V 53
+/svn/!svn/ver/3240/trunk/app/models/issue_priority.rb
+END
+message_observer.rb
+K 25
+svn:wc:ra_dav:version-url
+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
+enabled_module.rb
+K 25
+svn:wc:ra_dav:version-url
+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
+V 45
+/svn/!svn/ver/479/trunk/app/models/comment.rb
+END
+wiki_content_observer.rb
+K 25
+svn:wc:ra_dav:version-url
+V 60
+/svn/!svn/ver/2749/trunk/app/models/wiki_content_observer.rb
 END
 query.rb
 K 25
 svn:wc:ra_dav:version-url
-V 58
-/svn/!svn/ver/4585/branches/1.1-stable/app/models/query.rb
+V 44
+/svn/!svn/ver/4553/trunk/app/models/query.rb
+END
+member.rb
+K 25
+svn:wc:ra_dav:version-url
+V 45
+/svn/!svn/ver/3929/trunk/app/models/member.rb
+END
+document_category_custom_field.rb
+K 25
+svn:wc:ra_dav:version-url
+V 69
+/svn/!svn/ver/2945/trunk/app/models/document_category_custom_field.rb
+END
+mailer.rb
+K 25
+svn:wc:ra_dav:version-url
+V 45
+/svn/!svn/ver/4373/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
+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
+V 55
+/svn/!svn/ver/333/trunk/app/models/user_custom_field.rb
+END
+time_entry_custom_field.rb
+K 25
+svn:wc:ra_dav:version-url
+V 62
+/svn/!svn/ver/1689/trunk/app/models/time_entry_custom_field.rb
+END
+custom_field.rb
+K 25
+svn:wc:ra_dav:version-url
+V 51
+/svn/!svn/ver/4599/trunk/app/models/custom_field.rb
+END
+setting.rb
+K 25
+svn:wc:ra_dav:version-url
+V 46
+/svn/!svn/ver/3417/trunk/app/models/setting.rb
 END
 user.rb
 K 25
 svn:wc:ra_dav:version-url
-V 57
-/svn/!svn/ver/4585/branches/1.1-stable/app/models/user.rb
+V 43
+/svn/!svn/ver/4599/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
+END
+news_observer.rb
+K 25
+svn:wc:ra_dav:version-url
+V 52
+/svn/!svn/ver/2637/trunk/app/models/news_observer.rb
+END
+message.rb
+K 25
+svn:wc:ra_dav:version-url
+V 46
+/svn/!svn/ver/3373/trunk/app/models/message.rb
+END
+wiki_redirect.rb
+K 25
+svn:wc:ra_dav:version-url
+V 51
+/svn/!svn/ver/720/trunk/app/models/wiki_redirect.rb
 END
 issue_relation.rb
 K 25
 svn:wc:ra_dav:version-url
-V 67
-/svn/!svn/ver/4585/branches/1.1-stable/app/models/issue_relation.rb
+V 53
+/svn/!svn/ver/4467/trunk/app/models/issue_relation.rb
+END
+document_observer.rb
+K 25
+svn:wc:ra_dav:version-url
+V 56
+/svn/!svn/ver/2637/trunk/app/models/document_observer.rb
 END
 version.rb
 K 25
 svn:wc:ra_dav:version-url
-V 60
-/svn/!svn/ver/4585/branches/1.1-stable/app/models/version.rb
+V 46
+/svn/!svn/ver/4574/trunk/app/models/version.rb
+END
+issue_priority_custom_field.rb
+K 25
+svn:wc:ra_dav:version-url
+V 66
+/svn/!svn/ver/2945/trunk/app/models/issue_priority_custom_field.rb
 END
 board.rb
 K 25
 svn:wc:ra_dav:version-url
+V 44
+/svn/!svn/ver/4431/trunk/app/models/board.rb
+END
+attachment.rb
+K 25
+svn:wc:ra_dav:version-url
+V 49
+/svn/!svn/ver/3774/trunk/app/models/attachment.rb
+END
+group_custom_field.rb
+K 25
+svn:wc:ra_dav:version-url
+V 57
+/svn/!svn/ver/2869/trunk/app/models/group_custom_field.rb
+END
+issue_status.rb
+K 25
+svn:wc:ra_dav:version-url
+V 51
+/svn/!svn/ver/4599/trunk/app/models/issue_status.rb
+END
+time_entry_activity.rb
+K 25
+svn:wc:ra_dav:version-url
 V 58
-/svn/!svn/ver/4585/branches/1.1-stable/app/models/board.rb
+/svn/!svn/ver/3240/trunk/app/models/time_entry_activity.rb
+END
+tracker.rb
+K 25
+svn:wc:ra_dav:version-url
+V 46
+/svn/!svn/ver/4599/trunk/app/models/tracker.rb
+END
+journal_detail.rb
+K 25
+svn:wc:ra_dav:version-url
+V 52
+/svn/!svn/ver/478/trunk/app/models/journal_detail.rb
 END
 group.rb
 K 25
 svn:wc:ra_dav:version-url
-V 58
-/svn/!svn/ver/4585/branches/1.1-stable/app/models/group.rb
+V 44
+/svn/!svn/ver/4437/trunk/app/models/group.rb
+END
+issue_observer.rb
+K 25
+svn:wc:ra_dav:version-url
+V 53
+/svn/!svn/ver/2637/trunk/app/models/issue_observer.rb
 END
 changeset.rb
 K 25
 svn:wc:ra_dav:version-url
-V 62
-/svn/!svn/ver/4614/branches/1.1-stable/app/models/changeset.rb
+V 48
+/svn/!svn/ver/4613/trunk/app/models/changeset.rb
+END
+role.rb
+K 25
+svn:wc:ra_dav:version-url
+V 43
+/svn/!svn/ver/4599/trunk/app/models/role.rb
+END
+project_custom_field.rb
+K 25
+svn:wc:ra_dav:version-url
+V 58
+/svn/!svn/ver/333/trunk/app/models/project_custom_field.rb
 END
 wiki.rb
 K 25
 svn:wc:ra_dav:version-url
-V 57
-/svn/!svn/ver/4585/branches/1.1-stable/app/models/wiki.rb
+V 43
+/svn/!svn/ver/4680/trunk/app/models/wiki.rb
+END
+custom_value.rb
+K 25
+svn:wc:ra_dav:version-url
+V 51
+/svn/!svn/ver/4382/trunk/app/models/custom_value.rb
 END
 project.rb
 K 25
 svn:wc:ra_dav:version-url
-V 60
-/svn/!svn/ver/4660/branches/1.1-stable/app/models/project.rb
+V 46
+/svn/!svn/ver/4645/trunk/app/models/project.rb
+END
+document_category.rb
+K 25
+svn:wc:ra_dav:version-url
+V 56
+/svn/!svn/ver/3240/trunk/app/models/document_category.rb
 END
 news.rb
 K 25
 svn:wc:ra_dav:version-url
-V 57
-/svn/!svn/ver/4585/branches/1.1-stable/app/models/news.rb
+V 43
+/svn/!svn/ver/4505/trunk/app/models/news.rb
 END
+user_preference.rb
+K 25
+svn:wc:ra_dav:version-url
+V 54
+/svn/!svn/ver/1623/trunk/app/models/user_preference.rb
+END