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
..
JavaCompilerPlugin.Configuration	Merge branch 'master' into copy_libs	2018-12-19 20:15:30 +01:00
JavaCompilerPlugin.Target	Merge remote-tracking branch 'origin/master'	2018-12-09 11:09:50 +01:00
JavaCompilerPlugin.Update	Merge remote-tracking branch 'origin/master'	2018-12-09 11:09:50 +01:00
.gitignore	Updated *.gitignore for IntelliJ settings.	2018-12-09 10:49:46 +01:00
.project	Initial commit.	2018-12-06 16:52:09 +01:00
pom.xml	Copy libs	2018-12-17 14:14:36 +01:00