comparison app/controllers/.svn/all-wcprops @ 129:5e974759e8b2 cannam

Merge from the default branch
author Chris Cannam
date Wed, 19 Jan 2011 15:15:02 +0000
parents cd2282d2aa55 07fa8a8b56a8
children eeebe205a056
comparison
equal deleted inserted replaced
127:32b5adec7422 129:5e974759e8b2
1 K 25 1 K 25
2 svn:wc:ra_dav:version-url 2 svn:wc:ra_dav:version-url
3 V 40 3 V 40
4 /svn/!svn/ver/4703/trunk/app/controllers 4 /svn/!svn/ver/4729/trunk/app/controllers
5 END 5 END
6 issues_controller.rb 6 issues_controller.rb
7 K 25 7 K 25
8 svn:wc:ra_dav:version-url 8 svn:wc:ra_dav:version-url
9 V 61 9 V 61
97 K 25 97 K 25
98 svn:wc:ra_dav:version-url 98 svn:wc:ra_dav:version-url
99 V 75 99 V 75
100 /svn/!svn/ver/4075/trunk/app/controllers/project_enumerations_controller.rb 100 /svn/!svn/ver/4075/trunk/app/controllers/project_enumerations_controller.rb
101 END 101 END
102 settings_controller.rb
103 K 25
104 svn:wc:ra_dav:version-url
105 V 63
106 /svn/!svn/ver/4432/trunk/app/controllers/settings_controller.rb
107 END
108 timelog_controller.rb
109 K 25
110 svn:wc:ra_dav:version-url
111 V 62
112 /svn/!svn/ver/4511/trunk/app/controllers/timelog_controller.rb
113 END
114 custom_fields_controller.rb 102 custom_fields_controller.rb
115 K 25 103 K 25
116 svn:wc:ra_dav:version-url 104 svn:wc:ra_dav:version-url
117 V 68 105 V 68
118 /svn/!svn/ver/3627/trunk/app/controllers/custom_fields_controller.rb 106 /svn/!svn/ver/3627/trunk/app/controllers/custom_fields_controller.rb
119 END 107 END
120 users_controller.rb 108 timelog_controller.rb
121 K 25 109 K 25
122 svn:wc:ra_dav:version-url 110 svn:wc:ra_dav:version-url
123 V 60 111 V 62
124 /svn/!svn/ver/4544/trunk/app/controllers/users_controller.rb 112 /svn/!svn/ver/4511/trunk/app/controllers/timelog_controller.rb
113 END
114 settings_controller.rb
115 K 25
116 svn:wc:ra_dav:version-url
117 V 63
118 /svn/!svn/ver/4432/trunk/app/controllers/settings_controller.rb
125 END 119 END
126 issue_moves_controller.rb 120 issue_moves_controller.rb
127 K 25 121 K 25
128 svn:wc:ra_dav:version-url 122 svn:wc:ra_dav:version-url
129 V 66 123 V 66
130 /svn/!svn/ver/4292/trunk/app/controllers/issue_moves_controller.rb 124 /svn/!svn/ver/4292/trunk/app/controllers/issue_moves_controller.rb
131 END 125 END
126 users_controller.rb
127 K 25
128 svn:wc:ra_dav:version-url
129 V 60
130 /svn/!svn/ver/4729/trunk/app/controllers/users_controller.rb
131 END
132 files_controller.rb 132 files_controller.rb
133 K 25 133 K 25
134 svn:wc:ra_dav:version-url 134 svn:wc:ra_dav:version-url
135 V 60 135 V 60
136 /svn/!svn/ver/4177/trunk/app/controllers/files_controller.rb 136 /svn/!svn/ver/4177/trunk/app/controllers/files_controller.rb
139 K 25 139 K 25
140 svn:wc:ra_dav:version-url 140 svn:wc:ra_dav:version-url
141 V 66 141 V 66
142 /svn/!svn/ver/4573/trunk/app/controllers/application_controller.rb 142 /svn/!svn/ver/4573/trunk/app/controllers/application_controller.rb
143 END 143 END
144 previews_controller.rb
145 K 25
146 svn:wc:ra_dav:version-url
147 V 63
148 /svn/!svn/ver/4174/trunk/app/controllers/previews_controller.rb
149 END
150 auth_sources_controller.rb
151 K 25
152 svn:wc:ra_dav:version-url
153 V 67
154 /svn/!svn/ver/3744/trunk/app/controllers/auth_sources_controller.rb
155 END
144 ldap_auth_sources_controller.rb 156 ldap_auth_sources_controller.rb
145 K 25 157 K 25
146 svn:wc:ra_dav:version-url 158 svn:wc:ra_dav:version-url
147 V 72 159 V 72
148 /svn/!svn/ver/3744/trunk/app/controllers/ldap_auth_sources_controller.rb 160 /svn/!svn/ver/3744/trunk/app/controllers/ldap_auth_sources_controller.rb
149 END 161 END
150 auth_sources_controller.rb
151 K 25
152 svn:wc:ra_dav:version-url
153 V 67
154 /svn/!svn/ver/3744/trunk/app/controllers/auth_sources_controller.rb
155 END
156 previews_controller.rb
157 K 25
158 svn:wc:ra_dav:version-url
159 V 63
160 /svn/!svn/ver/4174/trunk/app/controllers/previews_controller.rb
161 END
162 search_controller.rb 162 search_controller.rb
163 K 25 163 K 25
164 svn:wc:ra_dav:version-url 164 svn:wc:ra_dav:version-url
165 V 61 165 V 61
166 /svn/!svn/ver/3806/trunk/app/controllers/search_controller.rb 166 /svn/!svn/ver/3806/trunk/app/controllers/search_controller.rb
168 messages_controller.rb 168 messages_controller.rb
169 K 25 169 K 25
170 svn:wc:ra_dav:version-url 170 svn:wc:ra_dav:version-url
171 V 63 171 V 63
172 /svn/!svn/ver/3528/trunk/app/controllers/messages_controller.rb 172 /svn/!svn/ver/3528/trunk/app/controllers/messages_controller.rb
173 END
174 versions_controller.rb
175 K 25
176 svn:wc:ra_dav:version-url
177 V 63
178 /svn/!svn/ver/4354/trunk/app/controllers/versions_controller.rb
173 END 179 END
174 issue_relations_controller.rb 180 issue_relations_controller.rb
175 K 25 181 K 25
176 svn:wc:ra_dav:version-url 182 svn:wc:ra_dav:version-url
177 V 70 183 V 70
178 /svn/!svn/ver/3591/trunk/app/controllers/issue_relations_controller.rb 184 /svn/!svn/ver/3591/trunk/app/controllers/issue_relations_controller.rb
179 END 185 END
180 versions_controller.rb
181 K 25
182 svn:wc:ra_dav:version-url
183 V 63
184 /svn/!svn/ver/4354/trunk/app/controllers/versions_controller.rb
185 END
186 boards_controller.rb 186 boards_controller.rb
187 K 25 187 K 25
188 svn:wc:ra_dav:version-url 188 svn:wc:ra_dav:version-url
189 V 61 189 V 61
190 /svn/!svn/ver/3942/trunk/app/controllers/boards_controller.rb 190 /svn/!svn/ver/3942/trunk/app/controllers/boards_controller.rb
233 END 233 END
234 repositories_controller.rb 234 repositories_controller.rb
235 K 25 235 K 25
236 svn:wc:ra_dav:version-url 236 svn:wc:ra_dav:version-url
237 V 67 237 V 67
238 /svn/!svn/ver/4703/trunk/app/controllers/repositories_controller.rb 238 /svn/!svn/ver/4711/trunk/app/controllers/repositories_controller.rb
239 END 239 END
240 admin_controller.rb 240 admin_controller.rb
241 K 25 241 K 25
242 svn:wc:ra_dav:version-url 242 svn:wc:ra_dav:version-url
243 V 60 243 V 60