Eyck Jentzsch 0634b9cfd5 Merge branch 'develop' of https://git.minres.com/VP/SCViewer.git into ... develop Conflicts: com.minres.scviewer.database.test/inputs/simple_system.vcd com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java com.minres.scviewer.database.text/.settings/org.eclipse.jdt.groovy.core.prefs com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/SignalPainter.java com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformCanvas.java com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformViewer.java com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/WaveformColors.java com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDDbLoader.java com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDFileParser.java com.minres.scviewer.e4.application/plugin.xml com.minres.scviewer.e4.product/scviewer.product com.minres.scviewer.target/neon.target com.minres.scviewer.target/photon.target com.minres.scviewer.ui/.settings/org.eclipse.jdt.groovy.core.prefs		2018-10-11 15:22:10 +02:00
..
application	Merge branch 'develop' of https://git.minres.com/VP/SCViewer.git into	2018-10-11 15:22:10 +02:00