Michael Uhl a867231348 Merge remote-tracking branch 'origin/bytecode2' into plugin ... # Conflicts: # pom.xml # src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java # src/test/resources/testBytecode/generatedBC/.gitignore # test/bytecode/FacultyTest.java # test/bytecode/LambdaTest.java # test/bytecode/MatrixOpTest.java # test/bytecode/YTest.java		2018-12-25 15:52:46 +01:00
..
bytecode	Merge remote-tracking branch 'origin/bytecode2' into plugin	2018-12-25 15:52:46 +01:00