From d8cbb361b197c5c60321b3ffa9a604d163684114 Mon Sep 17 00:00:00 2001 From: ischommer Date: Thu, 19 Nov 2009 19:18:06 +0000 Subject: [PATCH] MINOR Added mergetracking info git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92221 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- .mergesources.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.mergesources.yml b/.mergesources.yml index 392df6c..5213072 100644 --- a/.mergesources.yml +++ b/.mergesources.yml @@ -2,10 +2,12 @@ # Keeps track of all opensource branches of submodules # that could be merged back to the current submodule paths. 2.3: + .: /open/phpinstaller/branches/2.3 sapphire: /open/modules/sapphire/branches/2.3 cms: /open/modules/cms/branches/2.3 jsparty: /open/modules/jsparty/branches/2.3 2.4: + .: /open/phpinstaller/branches/2.4 sapphire: /open/modules/sapphire/branches/2.4 cms: /open/modules/cms/branches/2.4 jsparty: /open/modules/jsparty/branches/2.4 \ No newline at end of file