db66f24ef28e962f6253bdd29cf2408deb61ed4c - objectteams/org.eclipse.objectteams

commit	db66f24ef28e962f6253bdd29cf2408deb61ed4c	[log] [tgz]
author	Stephan Herrmann <stephan.herrmann@berlin.de>	Tue Dec 31 17:54:29 2013 +0100
committer	Stephan Herrmann <stephan.herrmann@berlin.de>	Tue Dec 31 17:54:29 2013 +0100
tree	a2526dd1f2cee3d475cdae80f206030d81605c08
parent	da1b09096ff76d93ce69f54bccf09355d767c97e [diff]
parent	2b320b847ae04f787db6d55123fd8d15bdde5db7 [diff]

Merge commit '2b320b847ae04f787db6d55123fd8d15bdde5db7' into
OT_BETA_JAVA8

Conflicts:
	org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java
	org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java
	org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ParameterizedGenericMethodBinding.java
	org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java
	org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeConstants.java
	releng/build-scripts/build/otdt_prerequisites.sh

tree: a2526dd1f2cee3d475cdae80f206030d81605c08