commit 5d83a98aac93458ef8065e54614bd1ba2547eb11
author Stephan Herrmann <stephan.herrmann@berlin.de> Sat Dec 28 15:09:46 2013 +0100
committer Stephan Herrmann <stephan.herrmann@berlin.de> Sat Dec 28 21:26:11 2013 +0100
tree a654ad69b1753c0b672ae21260382c35ae4e9601
parent 112a9fe43fb0bc631ec7353a80d49a73f014db58
parent 7698613f7c36563430f70040457a7601e3bc9955

Merge commit '7698613f7c36563430f70040457a7601e3bc9955' into
OT_BETA_JAVA8

Conflicts:
	org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier.java
	org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier15.java
	releng/build-scripts/build/otdt_prerequisites.sh
	releng/map/otdt.map.in

releng/map/otdt.map.in

diff --git a/releng/map/otdt.map.in b/releng/map/otdt.map.in
index 60e1072..e1af027 100644
--- a/releng/map/otdt.map.in
+++ b/releng/map/otdt.map.in
@@ -29,7 +29,7 @@
 !plugin@org.eclipse.objectteams.otdt.earlyui=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.earlyui

 !plugin@org.eclipse.objectteams.otdt.metrics.export=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.metrics.export

 

-!** OT/J Plugins **!

+!** OT/J Plugins **!
 plugin@org.eclipse.objectteams.otequinox.branding,2.2.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox.branding,tag=OT_BETA_JAVA8

 plugin@org.eclipse.objectteams.otdt.jdt.ui,2.2.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.jdt.ui,tag=OT_BETA_JAVA8

 plugin@org.eclipse.objectteams.otdt.ui.help,2.2.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.ui.help,tag=OT_BETA_JAVA8