diff .svn/entries @ 524:1248a47e81b3 feature_36

Merge from branch "luisf"
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Mon, 25 Jul 2011 14:39:38 +0100
parents 851510f1b535
children 5e80956cc792
line wrap: on
line diff
--- a/.svn/entries	Fri Jul 15 17:21:05 2011 +0100
+++ b/.svn/entries	Mon Jul 25 14:39:38 2011 +0100
@@ -1,14 +1,14 @@
 10
 
 dir
-4411
-http://redmine.rubyforge.org/svn/trunk
+6270
+http://redmine.rubyforge.org/svn/branches/1.2-stable
 http://redmine.rubyforge.org/svn
 
 
 
-2010-11-17T18:27:38.712585Z
-4411
+2011-07-11T11:45:14.631570Z
+6261
 jplang
 has-props
 
@@ -32,6 +32,18 @@
 app
 dir
 
+.hgignore
+file
+
+
+
+
+
+cf080444603c5774a6f20da6bbafe234
+2011-03-28T04:54:13.617808Z
+5235
+tmaruyama
+
 log
 dir
 
@@ -41,7 +53,7 @@
 
 
 
-2010-09-23T14:37:44.367737Z
+2011-07-14T09:24:09.000000Z
 bbf560d44f092d22a30d3a562436ad8c
 2006-12-05T20:45:04.842118Z
 67
@@ -75,7 +87,7 @@
 
 
 
-2010-09-23T14:37:44.367737Z
+2011-07-14T09:24:09.000000Z
 67c937b1f1d0603e69f322de34bbfe04
 2010-07-18T15:49:24.341728Z
 3849
@@ -121,45 +133,45 @@
 script
 dir
 
-doc
-dir
+.gitignore
+file
+
+
+
+
+2011-07-14T09:24:09.000000Z
+84dbba0b6ddcd80d28c62a3f8e344bc4
+2011-02-15T11:04:52.942730Z
+4834
+tmaruyama
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+477
 
 config
 dir
 
-.gitignore
-file
-
-
-
-
-2010-09-23T14:37:44.363818Z
-201a803b90bbd2a1624c4ce1dd260098
-2010-06-09T22:01:21.132822Z
-3768
-edavis10
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-322
+doc
+dir
 
 lib
 dir