aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMalgorzata Janczarska2013-01-07 10:28:42 (EST)
committerMalgorzata Janczarska2013-01-07 11:13:46 (EST)
commit22e640ccdf70f6ba832a3ef553eefdf38dc8da11 (patch)
tree07647b89937c604bf85e411c7a42d0f95430bf08
parentc45b3651a3691586a696c013ed3f8c07f0ad6d50 (diff)
downloadeclipse.platform.releng.maps-22e640ccdf70f6ba832a3ef553eefdf38dc8da11.zip
eclipse.platform.releng.maps-22e640ccdf70f6ba832a3ef553eefdf38dc8da11.tar.gz
eclipse.platform.releng.maps-22e640ccdf70f6ba832a3ef553eefdf38dc8da11.tar.bz2
Bug 397351 - [backport] Casting to ContentMergeViewer breaks Viewer
contributions to EP org.eclipse.compare.contentMergeViewers, with an org.eclipse.compare.IViewerCreator, that provides just an org.eclipse.jface.viewers.Viewer
-rw-r--r--org.eclipse.releng/maps/compare.map2
-rw-r--r--org.eclipse.releng/maps/team.map2
2 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.releng/maps/compare.map b/org.eclipse.releng/maps/compare.map
index 7bedbfc..fbb62f1 100644
--- a/org.eclipse.releng/maps/compare.map
+++ b/org.eclipse.releng/maps/compare.map
@@ -1,6 +1,6 @@
!*************** COMPARE CONTRIBUTION ********************************************************
-plugin@org.eclipse.compare=GIT,tag=R37x_v20111109-0800,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.team.git,path=bundles/org.eclipse.compare/plugins/org.eclipse.compare
+plugin@org.eclipse.compare=GIT,tag=R37x_v20130107-0800,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.team.git,path=bundles/org.eclipse.compare/plugins/org.eclipse.compare
plugin@org.eclipse.compare.core=GIT,tag=I20110208-0800,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.team.git,path=bundles/org.eclipse.compare/plugins/org.eclipse.compare.core
plugin@org.eclipse.compare.win32=GIT,tag=I20110510-0800,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.team.git,path=bundles/org.eclipse.compare/plugins/org.eclipse.compare.win32
diff --git a/org.eclipse.releng/maps/team.map b/org.eclipse.releng/maps/team.map
index 57dac7d..b5ca617 100644
--- a/org.eclipse.releng/maps/team.map
+++ b/org.eclipse.releng/maps/team.map
@@ -4,7 +4,7 @@ plugin@org.eclipse.team.core=GIT,tag=I20110525-0800,repo=git://git.eclipse.org/g
plugin@org.eclipse.team.cvs.core=GIT,tag=I20110510-0800,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.team.git,path=bundles/org.eclipse.team.cvs.core
plugin@org.eclipse.team.cvs.ssh=GIT,tag=I20110208-0800,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.team.git,path=bundles/org.eclipse.team.cvs.ssh
plugin@org.eclipse.team.cvs.ssh2=GIT,tag=I20110511-0800,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.team.git,path=bundles/org.eclipse.team.cvs.ssh2
-plugin@org.eclipse.team.ui=GIT,tag=R37x_v20111109-0800,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.team.git,path=bundles/org.eclipse.team.ui
+plugin@org.eclipse.team.ui=GIT,tag=R37x_v20130107-0800,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.team.git,path=bundles/org.eclipse.team.ui
plugin@org.eclipse.team.cvs.ui=GIT,tag=v20120126-1227,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.team.git,path=bundles/org.eclipse.team.cvs.ui
plugin@org.eclipse.core.net=GIT,tag=I20110511-0800,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.team.git,path=bundles/org.eclipse.core.net