Merge branch 'master' into develop
Conflicts: features/com.minres.scviewer.database.feature/pom.xml features/com.minres.scviewer.e4.feature/pom.xml features/com.minres.scviewer.e4.platform.feature/pom.xml features/com.minres.scviewer.feature/pom.xml features/com.minres.scviewer.ui.feature/pom.xml plugins/com.minres.scviewer.database.sqlite/pom.xml plugins/com.minres.scviewer.database.text/pom.xml plugins/com.minres.scviewer.database.ui.swt/pom.xml plugins/com.minres.scviewer.database.vcd/pom.xml plugins/com.minres.scviewer.database/pom.xml plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF plugins/com.minres.scviewer.e4.application/pom.xml plugins/com.minres.scviewer.ui/pom.xml pom.xml products/com.minres.scviewer.e4.product/pom.xml products/com.minres.scviewer.e4.product/scviewer.product releng/com.minres.scviewer.target/pom.xml releng/com.minres.scviewer.updateSite/pom.xml tests/com.minres.scviewer.database.test/pom.xml
This commit is contained in:
commit
b75018239a