Manfred Karrer 0eccfb87cc Merge branch 'master' into Development ... # Conflicts: # gui/src/main/resources/i18n/in_dev/displayStrings_pt.properties		2016-11-06 23:23:00 +01:00
..
src	Merge branch 'master' into Development	2016-11-06 23:23:00 +01:00
pom.xml	Prepare for v 0.4.9.7	2016-10-19 22:04:46 +02:00