diff options
author | Cedric Brun | 2011-01-31 10:38:51 +0000 |
---|---|---|
committer | Cedric Brun | 2011-01-31 10:38:51 +0000 |
commit | 47e46bf235314df3b3ee76ae34652365fd796669 (patch) | |
tree | 3bb19bfe8f06ad79afac1afdac1441fe4a5db53a | |
parent | 5abe6dc3fad60888526a433e2f9123cc2894fb47 (diff) | |
parent | d5620e878c63abc84b24ac8434cf7f07a86de12e (diff) | |
download | org.eclipse.emf.compare-47e46bf235314df3b3ee76ae34652365fd796669.tar.gz org.eclipse.emf.compare-47e46bf235314df3b3ee76ae34652365fd796669.tar.xz org.eclipse.emf.compare-47e46bf235314df3b3ee76ae34652365fd796669.zip |
Merge remote branch 'origin'
-rw-r--r-- | packaging/org.eclipse.emf.compare.releng.buckminster/releng/compare-platform.rmap | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/packaging/org.eclipse.emf.compare.releng.buckminster/releng/compare-platform.rmap b/packaging/org.eclipse.emf.compare.releng.buckminster/releng/compare-platform.rmap index 35b0d66f3..48a38b3ea 100644 --- a/packaging/org.eclipse.emf.compare.releng.buckminster/releng/compare-platform.rmap +++ b/packaging/org.eclipse.emf.compare.releng.buckminster/releng/compare-platform.rmap @@ -3,17 +3,17 @@ <rm:property key="checkout.location" value="${workspace.root}/"/> <rm:property key="eclipse.download" value="file:/home/data/httpd/download.eclipse.org"/> <rm:locator pattern="^org\.eclipse\.emf\.compare\.releng\.buckminster$" searchPathRef="local.releng"/> - <rm:locator pattern="^org\.eclipse\.emf\.query(?:\..+)?$" searchPathRef="indigo-staging"/> - <rm:locator pattern="^org\.eclipse\.emf\.validation(?:\..+)?$" searchPathRef="indigo-staging"/> - <rm:locator pattern="^org\.eclipse\.emf(?:\..+)?$" searchPathRef="indigo-staging"/> - <rm:locator pattern="^lpg\.runtime\.java$" searchPathRef="indigo-staging"/> - <rm:locator pattern="^org\.eclipse\.ocl(?:\..+)?$" searchPathRef="indigo-staging"/> - <rm:locator pattern="^org\.eclipse\.gmf(?:\..+)?$" searchPathRef="indigo-staging"/> - <rm:locator pattern="^org\.eclipse\.gef(?:\..+)?$" searchPathRef="indigo-staging"/> - <rm:locator pattern="^org\.eclipse\.draw2d(?:\..+)?$" searchPathRef="indigo-staging"/> - <rm:locator pattern="^org\.apache(?:\..+)?$" searchPathRef="indigo-staging"/> - <rm:locator pattern="^org\.w3c(?:\..+)?$" searchPathRef="indigo-staging"/> - <rm:locator pattern="^javax(?:\..+)?$" searchPathRef="indigo-staging"/> + <rm:locator pattern="^org\.eclipse\.emf\.query(?:\..+)?$" searchPathRef="helios"/> + <rm:locator pattern="^org\.eclipse\.emf\.validation(?:\..+)?$" searchPathRef="helios"/> + <rm:locator pattern="^org\.eclipse\.emf(?:\..+)?$" searchPathRef="helios"/> + <rm:locator pattern="^lpg\.runtime\.java$" searchPathRef="helios"/> + <rm:locator pattern="^org\.eclipse\.ocl(?:\..+)?$" searchPathRef="helios"/> + <rm:locator pattern="^org\.eclipse\.gmf(?:\..+)?$" searchPathRef="helios"/> + <rm:locator pattern="^org\.eclipse\.gef(?:\..+)?$" searchPathRef="helios"/> + <rm:locator pattern="^org\.eclipse\.draw2d(?:\..+)?$" searchPathRef="helios"/> + <rm:locator pattern="^org\.apache(?:\..+)?$" searchPathRef="helios"/> + <rm:locator pattern="^org\.w3c(?:\..+)?$" searchPathRef="helios"/> + <rm:locator pattern="^javax(?:\..+)?$" searchPathRef="helios"/> <rm:locator pattern="^org\.eclipse\.team\.svn(?:\..+)?$" searchPathRef="helios"/> <rm:locator searchPathRef="platform"/> <rm:searchPath name="local.releng"> @@ -40,7 +40,7 @@ </rm:searchPath> <rm:searchPath name="platform"> <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> - <rm:uri format="{0}/eclipse/updates/3.7milestones"> + <rm:uri format="{0}/eclipse/updates/3.6milestones"> <bc:propertyRef key="eclipse.download"/> </rm:uri> </rm:provider> |