develop # Conflicts: # com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java