Mercurial > hg > soundsoftware-site

diff config/.svn/entries @ 511:107d36338b70 live

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "cannam"
author Chris Cannam
date Thu, 14 Jul 2011 10:43:07 +0100
parents 851510f1b535
children
line wrap: on
line diff
--- a/config/.svn/entries	Thu Jun 09 16:51:06 2011 +0100
+++ b/config/.svn/entries	Thu Jul 14 10:43:07 2011 +0100
@@ -1,14 +1,14 @@
 10
 
 dir
-4411
-http://redmine.rubyforge.org/svn/trunk/config
+6270
+http://redmine.rubyforge.org/svn/branches/1.2-stable/config
 http://redmine.rubyforge.org/svn
 
 
 
-2010-11-14T15:14:19.280754Z
-4405
+2011-07-02T17:43:08.003284Z
+6161
 jplang
 has-props
 
@@ -32,11 +32,11 @@
 
 
 
-2010-11-19T13:04:51.216928Z
-974e583c59b4497382d2aa08f2b2ff01
-2010-11-02T19:00:36.834304Z
-4362
-edavis10
+2011-07-14T09:24:09.000000Z
+0f6fe2db3317d8b40af42a6d534da87e
+2010-12-15T21:18:06.237327Z
+4513
+jplang
 has-props
 
 
@@ -58,19 +58,19 @@
 
 
 
-4106
+4246
 
-email.yml.example
+configuration.yml.example
 file
 
 
 
 
-2010-09-23T14:37:44.731779Z
-a1c44811380e661aff4e67b6b366f2db
-2010-02-18T05:20:52.515080Z
-3448
-edavis10
+2011-07-14T09:24:09.000000Z
+69243d1b5b9b111da631c7034d51ba71
+2011-02-26T13:09:25.657748Z
+4950
+jplang
 has-props
 
 
@@ -92,7 +92,7 @@
 
 
 
-2120
+4886
 
 locales
 dir
@@ -103,11 +103,11 @@
 
 
 
-2010-11-19T13:04:51.216928Z
-3817ace6dd9dfb2fda37c5a67605b5e0
-2010-11-06T13:22:23.662480Z
-4372
-jplang
+2011-07-14T09:24:22.000000Z
+f1eebe0f75a51707ede6d40175e2f15c
+2011-04-04T11:53:29.801553Z
+5313
+tmaruyama
 has-props
 
 
@@ -129,7 +129,7 @@
 
 
 
-14427
+15093
 
 boot.rb
 file
@@ -137,11 +137,11 @@
 
 
 
-2010-09-23T14:37:44.731779Z
-cfce6ac16974777a93c14be034b2fdec
-2009-09-13T17:14:35.707881Z
-2887
-edavis10
+2011-07-14T09:24:09.000000Z
+2969e2a7b5ab1b2a014b5f0c94bac872
+2010-12-17T08:34:29.830642Z
+4516
+jplang
 has-props
 
 
@@ -163,7 +163,7 @@
 
 
 
-2795
+3203
 
 initializers
 dir
@@ -174,10 +174,10 @@
 
 
 
-2010-09-23T14:37:44.731779Z
-197d8958c94ce40f08a4b8f1d2c49f6e
-2010-02-06T10:40:21.867545Z
-3372
+2011-07-14T09:24:21.000000Z
+e67b4e0a2d4ca847d47fa960eeb2a55d
+2011-03-04T14:32:58.878627Z
+5003
 jplang
 has-props
 
@@ -200,7 +200,7 @@
 
 
 
-2494
+2572
 
 environments
 dir
@@ -211,7 +211,7 @@
 
 
 
-2010-09-23T14:37:44.731779Z
+2011-07-14T09:24:09.000000Z
 6b63489cdd262e653712af1aa96cd390
 2009-11-08T02:16:42.659918Z
 3018
@@ -245,10 +245,10 @@
 
 
 
-2010-09-23T14:37:44.731779Z
-b315245d4b4a47a512931d087b03435f
-2010-03-12T13:48:14.426661Z
-3564
+2011-07-14T09:24:09.000000Z
+f33e1e1bf73ba5d10ef3a6f170da3088
+2011-01-23T10:25:48.265995Z
+4753
 jplang
 has-props
 
@@ -271,5 +271,5 @@
 
 
 
-750
+755