eyck ad2937c332 Merge branch 'master' into develop ... Conflicts: com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/DefaultValuesInitializer.java com.opcoach.e4.preferences/src/com/opcoach/e4/preferences/internal/E4PreferenceRegistry.java		2020-03-25 23:20:15 +01:00
..
MANIFEST.MF	Merge branch 'master' into develop	2020-03-25 23:20:15 +01:00