diff options
| author | Jay Arthanareeswaran | 2016-11-07 08:15:23 +0000 |
|---|---|---|
| committer | Jay Arthanareeswaran | 2016-11-07 08:15:23 +0000 |
| commit | a7fd933d3355139bdf6e1300919630a9aaa4cb30 (patch) | |
| tree | cb42785bfa375db78de57739f3a8a46f7968eb38 /org.eclipse.jdt.apt.tests | |
| parent | 8ccc1b5da989e2155e439ba0a0ef4643ecfd3b92 (diff) | |
| parent | 252a974d323cbbc68d103c906dfa528385658db0 (diff) | |
| download | eclipse.jdt.core-a7fd933d3355139bdf6e1300919630a9aaa4cb30.tar.gz eclipse.jdt.core-a7fd933d3355139bdf6e1300919630a9aaa4cb30.tar.xz eclipse.jdt.core-a7fd933d3355139bdf6e1300919630a9aaa4cb30.zip | |
Merge remote-tracking branch 'origin/master' into BETA_JAVA9
# Conflicts:
# org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java
# org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java
# org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFileReader.java
# org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/rewrite/ImportRewrite.java
# org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFile.java
# org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java
# org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathDirectory.java
# org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathJar.java
# org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/HierarchyBuilder.java
Change-Id: I8e3e670b80d9cc3324a3123e8a87d9f0e5d8060e
Diffstat (limited to 'org.eclipse.jdt.apt.tests')
| -rw-r--r-- | org.eclipse.jdt.apt.tests/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jdt.apt.tests/.gitignore b/org.eclipse.jdt.apt.tests/.gitignore index ec50cf6e70..9cfa29c19b 100644 --- a/org.eclipse.jdt.apt.tests/.gitignore +++ b/org.eclipse.jdt.apt.tests/.gitignore @@ -3,3 +3,4 @@ aptext.jar /bin /bin-annotations /bin-ext +/test.dat |