Andrea Cavalli 12329c5ffe Merge remote-tracking branch 'origin/master' ... # Conflicts: # core/src/main/java/it/cavallium/warppi/gui/CalculatorHUD.java		2019-12-16 16:59:05 +01:00
..
java	Merge remote-tracking branch 'origin/master'	2019-12-16 16:59:05 +01:00
jni	Moved StaticVars to Settings, moved other packages and organized imports	2018-09-12 22:16:58 +02:00