DrJava Legacy SVN Repository

% svn merge --dry-run https://drjava.svn.sourceforge.net/svnroot/drjava/trunk .
--- Merging r5337 through r5345 into '.':
C plt/src/edu/rice/cs/plt/reflect/JavaVersion.java
U plt/src/edu/rice/cs/plt/reflect/JavaVersionTest.java
C eclipse/lib/plt.jar
U platform/src-mint/edu/rice/cs/drjava/model/compiler/MintCompiler.java
C platform/classes/base-mint/edu/rice/cs/drjava/model/compiler/MintCompiler$CompilerErrorListener.class
C platform/classes/base-mint/edu/rice/cs/drjava/model/compiler/MintCompiler.class
C platform/classes/base-mint/edu/rice/cs/drjava/model/compiler/MintCompiler$2.class
C platform/classes/base-mint/edu/rice/cs/drjava/model/compiler/MintCompiler$3.class
C dynamicjava/lib/plt.jar
C drjava/lib/platform.jar
C drjava/lib/javalanglevels-base.jar
C drjava/lib/dynamicjava-base.jar
C drjava/lib/plt.jar
C drjava/src/edu/rice/cs/drjava/model/JarJDKToolsLibrary.java
C drjava/src/edu/rice/cs/drjava/model/repl/newjvm/InterpreterJVM.java
U drjava/src/edu/rice/cs/drjava/model/compiler/JavacCompiler.java
U drjava/src/edu/rice/cs/drjava/ui/MainFrame.java
U drjava/src/edu/rice/cs/drjava/ui/DrJavaErrorHandler.java
C javalanglevels/lib/plt.jar
Summary of conflicts:
Text conflicts: 13
Tree conflicts: 1

_M .
M plt/src/edu/rice/cs/plt/reflect/JavaVersionTest.java
M plt/src/edu/rice/cs/plt/reflect/JavaVersion.java
_M plt/src/edu/rice/cs/plt/collect/MutableRelationTest.java
M eclipse/lib/plt.jar
M platform/src-hj/edu/rice/cs/drjava/model/compiler/descriptors/HjDescriptor.java
M platform/src-hj/edu/rice/cs/drjava/model/compiler/HjCompiler.java
M platform/src-mint/edu/rice/cs/drjava/model/compiler/MintCompiler.java
M platform/classes/base-nextgen/edu/rice/cs/drjava/model/compiler/NextGenCompiler$1.class
M platform/classes/base-hj/edu/rice/cs/drjava/model/compiler/HjCompiler.class
A platform/classes/base-hj/edu/rice/cs/drjava/model/compiler/descriptors
AM platform/classes/base-hj/edu/rice/cs/drjava/model/compiler/descriptors/HjDescriptor.class
M platform/classes/base-hj/edu/rice/cs/drjava/model/compiler/HjCompiler$1.class
M platform/classes/base-hj/edu/rice/cs/drjava/model/compiler/HjCompiler$2.class
M platform/classes/base-hj/edu/rice/cs/drjava/model/compiler/HjCompiler$1$1.class
M dynamicjava/lib/plt.jar
_M dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/ImportContext.java
_M dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/ClassChecker.java
M drjava/lib/platform.jar
M drjava/lib/javalanglevels-base.jar
M drjava/lib/dynamicjava-base.jar
M drjava/lib/plt.jar
M drjava/src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java
M drjava/src/edu/rice/cs/drjava/model/compiler/JavacCompiler.java
M drjava/src/edu/rice/cs/drjava/ui/MainFrame.java
M drjava/src/edu/rice/cs/drjava/ui/DrJavaErrorHandler.java
M javalanglevels/lib/plt.jar
M javalanglevels/src/edu/rice/cs/javalanglevels/LanguageLevelConverter.java