diff options
| author | Markus Keller | 2016-09-08 15:22:10 +0000 |
|---|---|---|
| committer | Markus Keller | 2016-09-08 16:14:57 +0000 |
| commit | b4982749a45af9f2fcf06a18f401056b55ecb7f8 (patch) | |
| tree | e09051100750b708fde10ec1cfd144a92aa26cc6 /org.eclipse.jdt.apt.ui/.classpath | |
| parent | e157b21bb74eaf6b41c3411a9206ec3f8b5f29a2 (diff) | |
| parent | 939cdd38674f6d8def82d09c3784113f9d5616d7 (diff) | |
| download | eclipse.jdt.core-b4982749a45af9f2fcf06a18f401056b55ecb7f8.tar.gz eclipse.jdt.core-b4982749a45af9f2fcf06a18f401056b55ecb7f8.tar.xz eclipse.jdt.core-b4982749a45af9f2fcf06a18f401056b55ecb7f8.zip | |
Merge remote-tracking branch 'origin/master' into BETA_JAVA9
Conflicts:
org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullTypeAnnotationTest.java -> resurrected testBug489674 that was lost in a previous merge
org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodScope.java
Diffstat (limited to 'org.eclipse.jdt.apt.ui/.classpath')
| -rw-r--r-- | org.eclipse.jdt.apt.ui/.classpath | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jdt.apt.ui/.classpath b/org.eclipse.jdt.apt.ui/.classpath index 3bc247511f..22f30643cb 100644 --- a/org.eclipse.jdt.apt.ui/.classpath +++ b/org.eclipse.jdt.apt.ui/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> |