diff app/models/.svn/all-wcprops @ 514:7eba09d624db live

Merge

--- a/app/models/.svn/all-wcprops	Thu Jul 14 10:46:20 2011 +0100
+++ b/app/models/.svn/all-wcprops	Thu Jul 14 10:50:53 2011 +0100
@@ -1,371 +1,95 @@
 K 25
 svn:wc:ra_dav:version-url
-V 35
-/svn/!svn/ver/4404/trunk/app/models
+V 49
+/svn/!svn/ver/6254/branches/1.2-stable/app/models
 END
-document.rb
+setting.rb
 K 25
 svn:wc:ra_dav:version-url
-V 47
-/svn/!svn/ver/3358/trunk/app/models/document.rb
+V 60
+/svn/!svn/ver/6105/branches/1.2-stable/app/models/setting.rb
+END
+repository.rb
+K 25
+svn:wc:ra_dav:version-url
+V 63
+/svn/!svn/ver/6244/branches/1.2-stable/app/models/repository.rb
 END
 mail_handler.rb
 K 25
 svn:wc:ra_dav:version-url
-V 51
-/svn/!svn/ver/4404/trunk/app/models/mail_handler.rb
+V 65
+/svn/!svn/ver/6200/branches/1.2-stable/app/models/mail_handler.rb
 END
-repository.rb
+version.rb
 K 25
 svn:wc:ra_dav:version-url
-V 49
-/svn/!svn/ver/3472/trunk/app/models/repository.rb
+V 60
+/svn/!svn/ver/6200/branches/1.2-stable/app/models/version.rb
 END
-time_entry.rb
+issue_relation.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
+V 67
+/svn/!svn/ver/6125/branches/1.2-stable/app/models/issue_relation.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
+V 67
+/svn/!svn/ver/6200/branches/1.2-stable/app/models/issue_category.rb
 END
 enumeration.rb
 K 25
 svn:wc:ra_dav:version-url
-V 50
-/svn/!svn/ver/3240/trunk/app/models/enumeration.rb
+V 64
+/svn/!svn/ver/6200/branches/1.2-stable/app/models/enumeration.rb
+END
+attachment.rb
+K 25
+svn:wc:ra_dav:version-url
+V 63
+/svn/!svn/ver/6105/branches/1.2-stable/app/models/attachment.rb
 END
 issue.rb
 K 25
 svn:wc:ra_dav:version-url
-V 44
-/svn/!svn/ver/4394/trunk/app/models/issue.rb
+V 58
+/svn/!svn/ver/6160/branches/1.2-stable/app/models/issue.rb
 END
-time_entry_activity_custom_field.rb
+tracker.rb
 K 25
 svn:wc:ra_dav:version-url
-V 71
-/svn/!svn/ver/2952/trunk/app/models/time_entry_activity_custom_field.rb
+V 60
+/svn/!svn/ver/6200/branches/1.2-stable/app/models/tracker.rb
 END
-member_role.rb
+issue_status.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
-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
+V 65
+/svn/!svn/ver/6200/branches/1.2-stable/app/models/issue_status.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
+V 62
+/svn/!svn/ver/6207/branches/1.2-stable/app/models/wiki_page.rb
 END
 query.rb
 K 25
 svn:wc:ra_dav:version-url
-V 44
-/svn/!svn/ver/4387/trunk/app/models/query.rb
+V 58
+/svn/!svn/ver/6175/branches/1.2-stable/app/models/query.rb
 END
-member.rb
+project.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
+V 60
+/svn/!svn/ver/6205/branches/1.2-stable/app/models/project.rb
 END
 workflow.rb
 K 25
 svn:wc:ra_dav:version-url
-V 47
-/svn/!svn/ver/3709/trunk/app/models/workflow.rb
+V 61
+/svn/!svn/ver/6159/branches/1.2-stable/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/3672/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 43
-/svn/!svn/ver/4234/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 53
-/svn/!svn/ver/3729/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 46
-/svn/!svn/ver/4073/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/3167/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/3881/trunk/app/models/issue_status.rb
-END
-time_entry_activity.rb
-K 25
-svn:wc:ra_dav:version-url
-V 58
-/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/3188/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 44
-/svn/!svn/ver/2869/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 48
-/svn/!svn/ver/3928/trunk/app/models/changeset.rb
-END
-role.rb
-K 25
-svn:wc:ra_dav:version-url
-V 43
-/svn/!svn/ver/3363/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 43
-/svn/!svn/ver/3632/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 46
-/svn/!svn/ver/4402/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 43
-/svn/!svn/ver/3358/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