aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Rennie2011-11-30 14:47:51 (EST)
committerMike Rennie2011-11-30 14:47:51 (EST)
commit9bc4c19bbf78f41b419dbcd99b1a1b508a6b5c30 (patch)
tree82d63af4845986e22e37bd43f3aa9a3ac4d6eedc
parent7266897403c491684e7f80530a1e4a525e0e6160 (diff)
downloadeclipse.platform.releng.maps-9bc4c19bbf78f41b419dbcd99b1a1b508a6b5c30.zip
eclipse.platform.releng.maps-9bc4c19bbf78f41b419dbcd99b1a1b508a6b5c30.tar.gz
eclipse.platform.releng.maps-9bc4c19bbf78f41b419dbcd99b1a1b508a6b5c30.tar.bz2
move core.variables map entry to debug map + remove core-variables map
-rw-r--r--org.eclipse.releng/maps/core-variables.map3
-rw-r--r--org.eclipse.releng/maps/jdtdebug.map10
2 files changed, 1 insertions, 12 deletions
diff --git a/org.eclipse.releng/maps/core-variables.map b/org.eclipse.releng/maps/core-variables.map
deleted file mode 100644
index 7c6f63f..0000000
--- a/org.eclipse.releng/maps/core-variables.map
+++ /dev/null
@@ -1,3 +0,0 @@
-!*************** CORE VARIABLES CONTRIBUTION ********************************************************
-
-plugin@org.eclipse.core.variables=v20110511,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse, \ No newline at end of file
diff --git a/org.eclipse.releng/maps/jdtdebug.map b/org.eclipse.releng/maps/jdtdebug.map
index d3ba7c6..47f8475 100644
--- a/org.eclipse.releng/maps/jdtdebug.map
+++ b/org.eclipse.releng/maps/jdtdebug.map
@@ -1,12 +1,8 @@
!*************** DEBUG CONTRIBUTION ********************************************************
-<<<<<<< HEAD
-plugin@org.eclipse.debug.core=GIT,tag=v20111129-2031,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.debug.git,path=org.eclipse.debug.core
-plugin@org.eclipse.debug.ui=GIT,tag=v20111129-1926,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.debug.git,path=org.eclipse.debug.ui
-=======
+plugin@org.eclipse.core.variables=GIT,tag=v20110511,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.debug.git,path=org.eclipse.core.variables
plugin@org.eclipse.debug.core=GIT,tag=v20111129-2031,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.debug.git,path=org.eclipse.debug.core
plugin@org.eclipse.debug.ui=GIT,tag=v20111129-1423_r372,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.debug.git,path=org.eclipse.debug.ui
->>>>>>> 7860a06a890df04df8acc850c5e2aceaf0c13ee8
plugin@org.eclipse.debug.examples.core=GIT,tag=v20111007_r372,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.debug.git,path=org.eclipse.debug.examples.core
plugin@org.eclipse.debug.examples.ui=GIT,tag=v20111007_r372,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.debug.git,path=org.eclipse.debug.examples.ui
plugin@org.eclipse.ui.externaltools=GIT,tag=v20111007_r372,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.debug.git,path=org.eclipse.ui.externaltools
@@ -19,8 +15,4 @@ plugin@org.eclipse.jdt.debug.ui=GIT,tag=v20111006_r372,repo=git://git.eclipse.or
plugin@org.eclipse.jdt.launching=GIT,tag=v20111006_r372,repo=git://git.eclipse.org/gitroot/jdt/eclipse.jdt.debug.git,path=org.eclipse.jdt.launching
plugin@org.eclipse.jdt.launching.macosx=GIT,tag=v20111006_r372,repo=git://git.eclipse.org/gitroot/jdt/eclipse.jdt.debug.git,path=org.eclipse.jdt.launching.macosx
plugin@org.eclipse.jdt.launching.ui.macosx=GIT,tag=v20111006_r372,repo=git://git.eclipse.org/gitroot/jdt/eclipse.jdt.debug.git,path=org.eclipse.jdt.launching.ui.macosx
-<<<<<<< HEAD
-plugin@org.eclipse.jdt.debug.tests=GIT,tag=v20111122-1715,repo=git://git.eclipse.org/gitroot/jdt/eclipse.jdt.debug.git,path=org.eclipse.jdt.debug.tests
-=======
plugin@org.eclipse.jdt.debug.tests=GIT,tag=v20111122-1715,repo=git://git.eclipse.org/gitroot/jdt/eclipse.jdt.debug.git,path=org.eclipse.jdt.debug.tests
->>>>>>> 7860a06a890df04df8acc850c5e2aceaf0c13ee8