Mercurial > hg > soundsoftware-site

diff app/controllers/.svn/entries @ 120:cd2282d2aa55 cannam

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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).
author Chris Cannam
date Thu, 13 Jan 2011 14:33:08 +0000
parents af80e5618e9b 8661b858af72
children 5e974759e8b2
line wrap: on
line diff
--- a/app/controllers/.svn/entries	Thu Jan 13 13:21:03 2011 +0000
+++ b/app/controllers/.svn/entries	Thu Jan 13 14:33:08 2011 +0000
@@ -2,13 +2,13 @@
 
 dir
 4707
-http://redmine.rubyforge.org/svn/branches/1.1-stable/app/controllers
+http://redmine.rubyforge.org/svn/trunk/app/controllers
 http://redmine.rubyforge.org/svn
 
 
 
-2011-01-13T12:10:52.246705Z
-4707
+2011-01-13T12:04:30.962313Z
+4703
 tmaruyama
 
 
@@ -32,10 +32,10 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:10.000000Z
 2166617cc44ef66371dcac04c09755c2
-2011-01-08T00:24:43.259837Z
-4653
+2011-01-08T00:19:51.192586Z
+4652
 tmaruyama
 has-props
 
@@ -66,7 +66,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.399747Z
 7ad6758cfd160c4b6ef6d71be06e087c
 2010-04-19T15:08:28.751734Z
 3684
@@ -100,7 +100,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.399747Z
 7a73aba15fcd447531d1552de01706d9
 2009-12-20T09:44:28.044710Z
 3201
@@ -134,7 +134,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.395735Z
 612f3e7497e14c728934e83fbe5778c4
 2009-12-20T09:45:04.782778Z
 3202
@@ -168,7 +168,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.399747Z
 3ee494bd8196306eab8913bd462b44da
 2010-06-20T16:08:15.578906Z
 3798
@@ -202,7 +202,7 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:10.000000Z
 edbdb443ff7cc8f299f7772b3532eca1
 2010-12-12T16:06:43.892596Z
 4503
@@ -236,7 +236,7 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:10.000000Z
 40ea055e0f9f9aa83680751fdab5a0a5
 2010-12-12T14:25:23.262992Z
 4497
@@ -270,7 +270,7 @@
 
 
 
-2010-10-01T15:15:02.000000Z
+2010-09-24T12:48:26.271687Z
 c2289eb9b654117a101c072955d4c705
 2010-09-23T15:20:19.085385Z
 4172
@@ -304,7 +304,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.395735Z
 20e245fa61dc0dcb2f105a8f0e6af98c
 2010-06-19T19:51:43.174421Z
 3784
@@ -338,7 +338,7 @@
 
 
 
-2011-01-13T12:46:09.000000Z
+2010-09-23T14:37:44.403745Z
 95ad1acf7766861a4dbd0aebd9c847de
 2009-10-21T03:21:31.657956Z
 2941
@@ -372,7 +372,7 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:10.000000Z
 596c3ab10f8cf4687f6d8b163e7a2243
 2010-12-29T19:55:52.079810Z
 4580
@@ -406,7 +406,7 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:10.000000Z
 bec68711fe4573cf428799354ea68f5d
 2010-12-18T17:11:41.680297Z
 4535
@@ -440,7 +440,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.403745Z
 5052c701a12ad27e88950dd4a745b0f8
 2010-03-04T05:33:45.236699Z
 3536
@@ -474,7 +474,7 @@
 
 
 
-2010-11-30T13:11:52.000000Z
+2010-11-19T13:04:46.996826Z
 dadcb57d89dc3c90c5fa099b143c07f8
 2010-10-05T16:07:17.015270Z
 4232
@@ -508,7 +508,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.399747Z
 8f7e6e7308912a6169a700b0c88174a0
 2010-04-27T16:43:52.584075Z
 3692
@@ -542,7 +542,7 @@
 
 
 
-2010-10-01T15:15:02.000000Z
+2010-09-24T12:48:26.271687Z
 828b364ba2850ceddb3caa566bf10124
 2010-09-10T16:00:49.687515Z
 4075
@@ -576,7 +576,7 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:10.000000Z
 3e6698f208a263105c7b4a59c60b26b3
 2010-12-14T18:29:24.891563Z
 4511
@@ -610,7 +610,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.391741Z
 00272455ac5be11da48f92c4a443c538
 2010-04-03T11:54:24.331654Z
 3627
@@ -644,7 +644,7 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:10.000000Z
 98c4c9f33f038160a44752d229926c32
 2010-11-27T14:06:11.754120Z
 4432
@@ -678,7 +678,7 @@
 
 
 
-2010-11-30T13:11:52.000000Z
+2010-11-19T13:04:47.000764Z
 cacd6ffe0ce299e2ede9d45b7ef8af42
 2010-10-25T18:44:46.868009Z
 4292
@@ -712,7 +712,7 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:10.000000Z
 645856b56e687a753f1fa3037f3c4922
 2010-12-20T17:45:09.037597Z
 4544
@@ -746,7 +746,7 @@
 
 
 
-2010-11-30T13:11:52.000000Z
+2010-11-19T13:04:47.000764Z
 f0246e8f8dde5ea7b93e4dc2162181fc
 2010-09-26T08:07:41.604064Z
 4177
@@ -780,7 +780,7 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:10.000000Z
 218c497f1c4c6d7b41cdac214e595156
 2010-12-23T14:49:14.339855Z
 4573
@@ -814,7 +814,7 @@
 
 
 
-2010-11-30T13:11:52.000000Z
+2010-11-19T13:04:47.000764Z
 c5ae4fae18159e70fd81c2487bb1daa1
 2010-09-24T16:26:46.819682Z
 4174
@@ -848,7 +848,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.391741Z
 237280766d09418161536250d514a7bf
 2010-05-23T03:16:31.304135Z
 3744
@@ -882,7 +882,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.395735Z
 5f7b9cb2e9c8a60db58ea0833cf481c5
 2010-05-23T03:16:31.304135Z
 3744
@@ -916,7 +916,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.399747Z
 0015154998f830227b636ee423f007f3
 2010-06-20T20:01:32.722003Z
 3806
@@ -950,7 +950,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.395735Z
 f3f4378ec15e1401ead0dcac4e9cb059
 2010-03-03T17:05:00.967826Z
 3528
@@ -984,7 +984,7 @@
 
 
 
-2010-11-30T13:11:52.000000Z
+2010-11-19T13:04:47.000764Z
 a98fb262a20669600a85c0f72202c5e6
 2010-11-01T13:13:32.982466Z
 4354
@@ -1018,7 +1018,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.395735Z
 c57448661f2eaab81c76f23d7f51e0ab
 2010-03-16T15:17:47.586688Z
 3591
@@ -1052,7 +1052,7 @@
 
 
 
-2010-09-10T14:59:23.000000Z
+2010-09-23T14:37:44.391741Z
 52638c82da929081099076d5aa0f9212
 2010-08-16T23:39:27.396462Z
 3942
@@ -1086,7 +1086,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.391741Z
 21c0e5d894d1429ac39f3253ae021594
 2010-01-05T18:16:03.565347Z
 3281
@@ -1120,7 +1120,7 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:10.000000Z
 cb358f888a6a92cc99bef83af92cd766
 2010-12-12T17:00:52.100205Z
 4505
@@ -1154,7 +1154,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.399747Z
 a5e793eb94e501be4c1a39acc65cc568
 2010-04-03T11:54:24.331654Z
 3627
@@ -1188,7 +1188,7 @@
 
 
 
-2010-09-10T14:59:23.000000Z
+2010-09-23T14:37:44.395735Z
 77209ec52ddcefafb0bfbb76195167ec
 2010-08-10T22:37:00.826946Z
 3934
@@ -1222,7 +1222,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.395735Z
 f0fdda9126d71c0b2d4638de50ab1097
 2010-02-12T19:15:39.389877Z
 3416
@@ -1256,7 +1256,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.399747Z
 28f2e44219870c62c9844354b78af6e1
 2010-04-03T11:54:24.331654Z
 3627
@@ -1290,7 +1290,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.403745Z
 7ae79a9d22586240a01af73834b718a3
 2010-02-05T16:57:02.094258Z
 3370
@@ -1324,10 +1324,10 @@
 
 
 
-2011-01-13T12:50:17.000000Z
-5f8369132602d57217cecc615f112b8d
-2011-01-13T12:10:52.246705Z
-4707
+2011-01-13T14:09:10.000000Z
+91079cca88e5e1c0a5a220ebc1a3ddda
+2011-01-13T12:04:30.962313Z
+4703
 tmaruyama
 has-props
 
@@ -1350,7 +1350,7 @@
 
 
 
-11158
+11248
 
 admin_controller.rb
 file
@@ -1358,7 +1358,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.391741Z
 ed65a11326fe54914ba3a750a2b6f943
 2009-12-19T20:33:24.113306Z
 3200
@@ -1392,10 +1392,10 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:10.000000Z
 c07d79c1bd100dd8972ea408c4fe549f
-2011-01-08T10:14:00.269730Z
-4660
+2011-01-06T20:57:17.003359Z
+4647
 jplang
 has-props
 
@@ -1426,7 +1426,7 @@
 
 
 
-2011-01-13T12:46:09.000000Z
+2010-09-23T14:37:44.391741Z
 d0ff6be1c749b765d9d64bef64c27537
 2010-08-03T15:26:50.842290Z
 3906
@@ -1460,7 +1460,7 @@
 
 
 
-2010-11-30T13:11:52.000000Z
+2010-11-19T13:04:47.000764Z
 0be20cab6d5ea49f428a90cf3afef3e3
 2010-11-07T22:38:10.728638Z
 4388
@@ -1494,7 +1494,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.395735Z
 119ceb4a27aa554d03867f46cb142d0e
 2010-03-17T15:41:58.766740Z
 3597
@@ -1528,7 +1528,7 @@
 
 
 
-2010-10-01T15:15:02.000000Z
+2010-11-19T13:04:47.000764Z
 81dbee1745da99b9ea499f3fbe1d3944
 2010-11-07T22:38:10.728638Z
 4388
@@ -1562,7 +1562,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.391741Z
 c2c68bf5fa3ed22a8f55c8414d1efce9
 2010-03-17T15:41:58.766740Z
 3597
@@ -1596,7 +1596,7 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:10.000000Z
 ccc57886f63cb0efb0149b601dd2ac43
 2010-11-27T10:34:44.408431Z
 4429
@@ -1630,7 +1630,7 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:10.000000Z
 ad33818a03b408419be4e616e8c88b5c
 2010-12-29T19:37:42.740543Z
 4579
@@ -1664,7 +1664,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.391741Z
 1caaedc7bb0a3085878dc94446c70ab0
 2010-03-02T20:03:09.514061Z
 3524