diff config/initializers/.svn/entries @ 118:b859cc0c4fa1 cannam

Merge from branch "redmine-1.1"
author Chris Cannam
date Thu, 13 Jan 2011 13:21:03 +0000
parents af80e5618e9b
children cd2282d2aa55
line wrap: on
line diff
--- a/config/initializers/.svn/entries	Thu Jan 06 10:41:19 2011 +0000
+++ b/config/initializers/.svn/entries	Thu Jan 13 13:21:03 2011 +0000
@@ -1,14 +1,14 @@
 10
 
 dir
-4411
-http://redmine.rubyforge.org/svn/trunk/config/initializers
+4707
+http://redmine.rubyforge.org/svn/branches/1.1-stable/config/initializers
 http://redmine.rubyforge.org/svn
 
 
 
-2010-11-09T19:44:37.907646Z
-4389
+2010-12-17T08:34:29.830642Z
+4516
 jplang
 has-props
 
@@ -32,7 +32,7 @@
 
 
 
-2010-09-23T14:37:44.743734Z
+2010-08-12T15:03:25.000000Z
 acc71445fc1c65ebe6fdeba695fea714
 2009-09-20T14:06:57.257282Z
 2895
@@ -66,7 +66,7 @@
 
 
 
-2010-09-23T14:37:44.743734Z
+2010-08-12T15:03:25.000000Z
 ceff5e8f4ea4a2540c9303dcdf936aed
 2009-02-21T11:04:50.579477Z
 2493
@@ -100,10 +100,10 @@
 
 
 
-2010-11-19T13:04:51.204890Z
-82c05bf7e87e057a6a3dd5d74a56ee7c
-2010-11-09T19:44:37.907646Z
-4389
+2011-01-13T12:50:18.000000Z
+e83154f604f9f3b0307e1b435f9cc95c
+2010-12-17T08:34:29.830642Z
+4516
 jplang
 has-props
 
@@ -126,7 +126,7 @@
 
 
 
-3061
+3149
 
 backtrace_silencers.rb
 file
@@ -134,7 +134,7 @@
 
 
 
-2010-09-23T14:37:44.743734Z
+2010-08-12T15:03:25.000000Z
 ca8db2f40b067cb8615263fa5a238517
 2009-09-20T14:06:57.257282Z
 2895
@@ -168,7 +168,7 @@
 
 
 
-2010-09-23T14:37:44.743734Z
+2010-08-12T15:03:25.000000Z
 386c37f359a87852920a3c3f3e4bbc84
 2008-07-04T18:55:45.736676Z
 1625
@@ -202,7 +202,7 @@
 
 
 
-2010-09-23T14:37:44.743734Z
+2010-08-12T15:03:25.000000Z
 0005ed7b233f71646e0f75b9994cf219
 2008-09-10T18:26:13.133776Z
 1797
@@ -236,7 +236,7 @@
 
 
 
-2010-09-23T14:37:44.743734Z
+2010-08-12T15:03:25.000000Z
 a7948d8e86bcd799c74945fe91b4a8b1
 2009-09-20T14:06:57.257282Z
 2895