Mercurial > hg > soundsoftware-site
diff lib/redmine/.svn/entries @ 514:7eba09d624db live
Merge
author | Chris Cannam |
---|---|
date | Thu, 14 Jul 2011 10:50:53 +0100 |
parents | 851510f1b535 |
children |
line wrap: on
line diff
--- a/lib/redmine/.svn/entries Thu Jul 14 10:46:20 2011 +0100 +++ b/lib/redmine/.svn/entries Thu Jul 14 10:50:53 2011 +0100 @@ -1,14 +1,14 @@ 10 dir -4411 -http://redmine.rubyforge.org/svn/trunk/lib/redmine +6270 +http://redmine.rubyforge.org/svn/branches/1.2-stable/lib/redmine http://redmine.rubyforge.org/svn -2010-11-14T16:24:21.989522Z -4406 +2011-07-11T11:45:14.631570Z +6261 jplang @@ -35,10 +35,10 @@ -2010-09-23T14:37:45.031809Z -7905a0773e7d2f6b468fc5b9e107db4d -2010-01-17T13:53:13.544777Z -3330 +2011-07-14T09:24:10.000000Z +85ff863202dfbf2a6e9447a3bcf7cc06 +2011-01-22T12:09:07.652831Z +4737 jplang has-props @@ -61,7 +61,41 @@ -2173 +2461 + +codeset_util.rb +file + + + + +2011-06-06T13:20:53.000000Z +49dc0eec18109d69f897a5e3e1e7a44b +2011-04-16T06:43:49.720334Z +5474 +tmaruyama + + + + + + + + + + + + + + + + + + + + + +744 themes.rb file @@ -69,10 +103,10 @@ -2010-09-23T14:37:45.043748Z -209d3f63cbc76795042695c71f6230f1 -2010-04-30T12:44:19.138265Z -3710 +2011-07-14T09:24:10.000000Z +23fd3a13b8bcd6b3e2547e913d5fae18 +2010-12-22T21:41:08.746858Z +4559 jplang has-props @@ -95,7 +129,7 @@ -2311 +3420 imap.rb file @@ -103,7 +137,7 @@ -2010-09-23T14:37:45.031809Z +2011-07-14T09:24:10.000000Z caeedebd5c05aede1d232510d03ad136 2008-12-31T14:56:30.439880Z 2220 @@ -140,7 +174,7 @@ -2010-09-23T14:37:45.031809Z +2011-07-14T09:24:10.000000Z ddadcd03b97455adae2451a2140afbf6 2009-05-30T23:00:22.602473Z 2776 @@ -174,7 +208,7 @@ -2010-09-23T14:37:45.015759Z +2011-07-14T09:24:10.000000Z 41c2852d003d94cb23c231f06be62d12 2008-01-20T13:07:19.003764Z 1081 @@ -202,13 +236,16 @@ 1160 +helpers +dir + utils.rb file -2010-09-23T14:37:45.047759Z +2011-07-14T09:24:10.000000Z d04b071ce8f05b44ca6993c56fea9b1f 2009-01-04T17:09:25.896068Z 2234 @@ -236,16 +273,13 @@ 1466 -helpers -dir - access_control.rb file -2010-09-23T14:37:45.015759Z +2011-07-14T09:24:10.000000Z e7e4c44515553e36bffa6e8f8960080b 2008-09-25T18:51:03.022592Z 1907 @@ -279,7 +313,7 @@ -2010-09-23T14:37:45.043748Z +2011-07-14T09:24:10.000000Z 6f968bcc4f81562e9cbddb02ebc62601 2010-02-17T20:05:51.124365Z 3444 @@ -310,13 +344,47 @@ core_ext dir +configuration.rb +file + + + + +2011-07-14T09:24:10.000000Z +2f47dda69333c012a55496a3792c369e +2011-02-25T14:30:05.998365Z +4949 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +3639 + about.rb file -2010-09-23T14:37:45.015759Z +2011-07-14T09:24:10.000000Z 91ed592a8419f1bec48ba880c7a86e29 2009-05-25T19:10:26.065563Z 2766 @@ -350,7 +418,7 @@ -2010-09-23T14:37:45.043748Z +2011-07-14T09:24:10.000000Z 4a40844a6cd11aa7409bc8f4e9a2c74e 2010-03-28T11:30:48.135356Z 3619 @@ -384,11 +452,11 @@ -2010-11-19T13:04:51.416932Z -cfdd5556d40422dd9610d2124a2fefac -2010-09-28T21:09:06.467392Z -4222 -edavis10 +2011-07-14T09:24:22.000000Z +818a8c71d5080050c1fe5a95e1469a3d +2011-03-04T14:32:58.878627Z +5003 +jplang @@ -410,7 +478,7 @@ -916 +976 i18n.rb file @@ -418,11 +486,11 @@ -2010-11-19T13:04:51.412966Z -f1b6f1af024068879494612c2494e865 -2010-09-26T17:13:52.794850Z -4183 -edavis10 +2011-07-14T09:28:12.000000Z +cc684405103aabd5f4aea0c21fd7c732 +2011-06-21T03:16:49.595160Z +6105 +jbbarth has-props @@ -444,18 +512,52 @@ -2378 +2255 scm dir +safe_attributes.rb +file + + + + +2011-07-14T09:24:10.000000Z +7f659c02de1ea89806beda1772dc4d36 +2010-12-12T13:11:53.259618Z +4491 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +2579 + platform.rb file -2010-09-23T14:37:45.031809Z +2011-07-14T09:24:10.000000Z 68165c83be56d3204c582958d933ff0a 2008-08-25T11:01:37.715099Z 1753 @@ -483,51 +585,51 @@ 1009 +version.rb +file + + + + +2011-07-14T09:28:12.000000Z +af4770b66da6d84e5f63c4698ab09a37 +2011-07-11T11:45:14.631570Z +6261 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +1083 + custom_field_format.rb file -2010-09-23T14:37:45.023772Z -7fd1fcfb204480b0e9903fd03c53a563 -2010-04-16T15:34:05.970144Z -3675 -edavis10 - - - - - - - - - - - - - - - - - - - - - -2761 - -version.rb -file - - - - -2010-11-19T13:04:51.412966Z -8241f5642ac2d1aaa38fc1625f8816e6 -2010-11-01T00:37:19.679270Z -4349 -edavis10 +2011-07-14T09:24:22.000000Z +ae8c89a602b7d18e390aa1a7865a2319 +2011-04-01T14:02:05.869935Z +5275 +jplang has-props @@ -549,7 +651,7 @@ -1056 +3066 mime_type.rb file @@ -557,11 +659,11 @@ -2010-09-23T14:37:45.031809Z -dbfad515b1d5c277d2f8e9d67233185e -2009-12-29T13:28:30.604471Z -3258 -jplang +2011-07-14T09:24:22.000000Z +9494e5229ba69caf5121fd1f90c0fb9e +2011-03-22T04:35:48.334519Z +5190 +tmaruyama has-props @@ -583,21 +685,21 @@ -3498 +3525 + +wiki_formatting +dir views dir -wiki_formatting -dir - activity.rb file -2010-09-23T14:37:45.015759Z +2011-07-14T09:24:10.000000Z 88435997a6d77548eab82526df38caf1 2008-07-27T18:38:31.746909Z 1702 @@ -631,7 +733,7 @@ -2010-09-23T14:37:45.047759Z +2011-07-14T09:24:10.000000Z 648c40cc515e97d063d2c2f218cbbc23 2010-02-17T20:47:50.603139Z 3446 @@ -665,11 +767,11 @@ -2010-11-19T13:04:51.412966Z +2011-07-14T09:28:12.000000Z 81bc46012d5a0067e18e08bada197d8c -2010-10-25T23:32:01.793182Z -4293 -edavis10 +2011-06-21T03:16:49.595160Z +6105 +jbbarth has-props @@ -699,7 +801,7 @@ -2010-11-19T13:04:51.412966Z +2011-07-14T09:24:10.000000Z 7f3739a749929e1f65efb292620d361b 2010-11-14T16:24:21.989522Z 4406 @@ -733,7 +835,7 @@ -2010-11-19T13:04:51.416932Z +2011-07-14T09:24:10.000000Z dfacee092edce74d74e8ea7d7a54aeba 2010-11-14T16:24:21.989522Z 4406 @@ -767,7 +869,7 @@ -2010-09-23T14:37:45.019747Z +2011-07-14T09:24:10.000000Z 7632bcee464a923f5aa7c9eba29f8081 2008-04-26T11:59:51.889210Z 1361 @@ -795,16 +897,16 @@ 77 -unified_diff.rb +ciphering.rb file -2010-09-23T14:37:45.047759Z -69c22a4064f90e2ce460a0c9013c7cd0 -2009-11-11T13:25:53.648186Z -3028 +2011-07-14T09:24:10.000000Z +763ba2f765c62f378371f2472679c464 +2011-02-26T13:09:25.657748Z +4950 jplang has-props @@ -827,8 +929,42 @@ -5259 +2933 default_data dir +unified_diff.rb +file + + + + +2011-07-14T09:24:22.000000Z +34031c9894d99cfc79820222a06d34c5 +2011-03-11T20:23:29.177962Z +5094 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +7317 +