SCViewer/com.minres.scviewer.databas...
Eyck Jentzsch 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
..
.settings Settings update 2019-04-11 06:09:35 +00:00
META-INF add initial implementation of TX hover 2020-03-21 06:28:28 +01:00
src Merge branch 'master' into develop 2020-03-25 23:20:15 +01:00
.classpath Fixed compiler warnings and moved execution environment to Java 1.8 2017-01-23 23:25:28 +01:00
.gitignore Restructured plugins 2015-11-03 22:30:49 +01:00
.project Restructured plugins 2015-11-03 22:30:49 +01:00
build.properties Restructured plugins 2015-11-03 22:30:49 +01:00
pom.xml add initial implementation of TX hover 2020-03-21 06:28:28 +01:00