diff lib/redmine/.svn/entries @ 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).
author Chris Cannam
date Thu, 13 Jan 2011 14:33:08 +0000
parents af80e5618e9b 8661b858af72
children 5e974759e8b2
line wrap: on
line diff
--- a/lib/redmine/.svn/entries	Thu Jan 13 13:21:03 2011 +0000
+++ b/lib/redmine/.svn/entries	Thu Jan 13 14:33:08 2011 +0000
@@ -2,14 +2,14 @@
 
 dir
 4707
-http://redmine.rubyforge.org/svn/branches/1.1-stable/lib/redmine
+http://redmine.rubyforge.org/svn/trunk/lib/redmine
 http://redmine.rubyforge.org/svn
 
 
 
-2011-01-10T18:13:09.451160Z
-4678
-jplang
+2011-01-11T08:41:35.993532Z
+4688
+tmaruyama
 
 
 
@@ -35,7 +35,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:45.031809Z
 7905a0773e7d2f6b468fc5b9e107db4d
 2010-01-17T13:53:13.544777Z
 3330
@@ -69,7 +69,7 @@
 
 
 
-2011-01-13T12:50:18.000000Z
+2011-01-13T14:09:39.000000Z
 23fd3a13b8bcd6b3e2547e913d5fae18
 2010-12-22T21:41:08.746858Z
 4559
@@ -103,7 +103,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:45.031809Z
 caeedebd5c05aede1d232510d03ad136
 2008-12-31T14:56:30.439880Z
 2220
@@ -140,7 +140,7 @@
 
 
 
-2011-01-13T12:46:09.000000Z
+2010-09-23T14:37:45.031809Z
 ddadcd03b97455adae2451a2140afbf6
 2009-05-30T23:00:22.602473Z
 2776
@@ -174,7 +174,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:45.015759Z
 41c2852d003d94cb23c231f06be62d12
 2008-01-20T13:07:19.003764Z
 1081
@@ -208,7 +208,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:45.047759Z
 d04b071ce8f05b44ca6993c56fea9b1f
 2009-01-04T17:09:25.896068Z
 2234
@@ -245,7 +245,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:45.015759Z
 e7e4c44515553e36bffa6e8f8960080b
 2008-09-25T18:51:03.022592Z
 1907
@@ -279,7 +279,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:45.043748Z
 6f968bcc4f81562e9cbddb02ebc62601
 2010-02-17T20:05:51.124365Z
 3444
@@ -316,7 +316,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:45.015759Z
 91ed592a8419f1bec48ba880c7a86e29
 2009-05-25T19:10:26.065563Z
 2766
@@ -350,7 +350,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:45.043748Z
 4a40844a6cd11aa7409bc8f4e9a2c74e
 2010-03-28T11:30:48.135356Z
 3619
@@ -384,7 +384,7 @@
 
 
 
-2010-11-30T13:11:53.000000Z
+2010-11-19T13:04:51.416932Z
 cfdd5556d40422dd9610d2124a2fefac
 2010-09-28T21:09:06.467392Z
 4222
@@ -418,7 +418,7 @@
 
 
 
-2011-01-13T12:50:18.000000Z
+2011-01-13T14:09:39.000000Z
 009b7a9ada5c3e83d6a7a26256c34951
 2010-12-17T08:34:29.830642Z
 4516
@@ -449,13 +449,47 @@
 scm
 dir
 
+safe_attributes.rb
+file
+
+
+
+
+2011-01-13T14:09:39.000000Z
+7f659c02de1ea89806beda1772dc4d36
+2010-12-12T13:11:53.259618Z
+4491
+jplang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2579
+
 platform.rb
 file
 
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:45.031809Z
 68165c83be56d3204c582958d933ff0a
 2008-08-25T11:01:37.715099Z
 1753
@@ -483,47 +517,13 @@
 
 1009
 
-safe_attributes.rb
-file
-
-
-
-
-2011-01-13T12:50:18.000000Z
-7f659c02de1ea89806beda1772dc4d36
-2010-12-12T13:11:53.259618Z
-4491
-jplang
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2579
-
 custom_field_format.rb
 file
 
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:45.023772Z
 7fd1fcfb204480b0e9903fd03c53a563
 2010-04-16T15:34:05.970144Z
 3675
@@ -557,10 +557,10 @@
 
 
 
-2011-01-13T12:50:18.000000Z
-8336d1bc603f436bacbab2255cab0eb9
-2011-01-10T18:13:09.451160Z
-4678
+2011-01-13T14:09:39.000000Z
+599c6a070c34c23117d1176bf811988d
+2011-01-02T12:16:40.859443Z
+4619
 jplang
 has-props
 
@@ -583,7 +583,7 @@
 
 
 
-1057
+1056
 
 mime_type.rb
 file
@@ -591,7 +591,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:45.031809Z
 dbfad515b1d5c277d2f8e9d67233185e
 2009-12-29T13:28:30.604471Z
 3258
@@ -631,7 +631,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:45.015759Z
 88435997a6d77548eab82526df38caf1
 2008-07-27T18:38:31.746909Z
 1702
@@ -665,7 +665,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:45.047759Z
 648c40cc515e97d063d2c2f218cbbc23
 2010-02-17T20:47:50.603139Z
 3446
@@ -699,7 +699,7 @@
 
 
 
-2010-11-30T13:11:53.000000Z
+2010-11-19T13:04:51.412966Z
 81bc46012d5a0067e18e08bada197d8c
 2010-10-25T23:32:01.793182Z
 4293
@@ -733,7 +733,7 @@
 
 
 
-2010-11-30T13:11:53.000000Z
+2010-11-19T13:04:51.412966Z
 7f3739a749929e1f65efb292620d361b
 2010-11-14T16:24:21.989522Z
 4406
@@ -767,7 +767,7 @@
 
 
 
-2010-11-30T13:11:53.000000Z
+2010-11-19T13:04:51.416932Z
 dfacee092edce74d74e8ea7d7a54aeba
 2010-11-14T16:24:21.989522Z
 4406
@@ -801,7 +801,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:45.019747Z
 7632bcee464a923f5aa7c9eba29f8081
 2008-04-26T11:59:51.889210Z
 1361
@@ -829,13 +829,16 @@
 
 77
 
+default_data
+dir
+
 unified_diff.rb
 file
 
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:45.047759Z
 69c22a4064f90e2ce460a0c9013c7cd0
 2009-11-11T13:25:53.648186Z
 3028
@@ -863,6 +866,3 @@
 
 5259
 
-default_data
-dir
-