Mercurial > hg > soundsoftware-site
diff vendor/plugins/acts_as_customizable/lib/.svn/entries @ 442:753f1380d6bc cannam
Merge from branch "redmine-1.2"
author | Chris Cannam |
---|---|
date | Mon, 06 Jun 2011 14:41:04 +0100 |
parents | eeebe205a056 cbce1fd3b1b7 |
children | 851510f1b535 |
line wrap: on
line diff
--- a/vendor/plugins/acts_as_customizable/lib/.svn/entries Thu Mar 03 15:08:45 2011 +0000 +++ b/vendor/plugins/acts_as_customizable/lib/.svn/entries Mon Jun 06 14:41:04 2011 +0100 @@ -1,14 +1,14 @@ 10 dir -4993 -http://redmine.rubyforge.org/svn/trunk/vendor/plugins/acts_as_customizable/lib +6000 +http://redmine.rubyforge.org/svn/branches/1.2-stable/vendor/plugins/acts_as_customizable/lib http://redmine.rubyforge.org/svn -2011-02-20T14:26:23.957459Z -4891 +2011-04-01T13:44:58.700463Z +5272 jplang @@ -32,10 +32,10 @@ -2011-03-03T11:40:18.000000Z -2a7f0cd4a6b5d7f58a12567604697208 -2011-02-20T14:26:23.957459Z -4891 +2011-06-06T13:18:33.000000Z +d72670b67576182b51bf4d8b4096cac8 +2011-04-01T13:44:58.700463Z +5272 jplang has-props @@ -58,5 +58,5 @@ -4469 +4490