Michael Uhl 345f0cf14b Merge branch 'master' into copy_libs ... # Conflicts: # JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/.classpath # JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/META-INF/MANIFEST.MF # JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/build.properties		2018-12-19 20:15:30 +01:00
..
pom.xml	Merge branch 'master' into copy_libs	2018-12-19 20:15:30 +01:00