Eyck Jentzsch d8c5b7d9c3 Merge branch 'develop' of https://git.minres.com/VP/SCViewer into ... develop # Conflicts: # com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java		2018-11-06 08:35:00 +01:00
..
application	Merge branch 'develop' of https://git.minres.com/VP/SCViewer into	2018-11-06 08:35:00 +01:00