|  | 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 |  | 
			
				
					|  | 220eaea73c | move to opcoach repository at https://www.opcoach.com/repository/2018-12 | 2020-03-25 22:52:39 +01:00 |  | 
			
				
					|  | f6e2224651 | fix preferences storage | 2020-03-24 08:09:52 +00:00 |  | 
			
				
					|  | 767b083a22 | fix preferences storage | 2020-03-21 15:17:34 +01:00 |  | 
			
				
					|  | f81e830e93 | Updated UI to reflect database changes esp. in VCD | 2018-11-06 08:26:39 +01:00 |  | 
			
				
					|  | 0107c423a3 | Fixed warnings in Java files and MANIFESTS.MF, updated version numbers | 2018-10-14 21:29:09 +02:00 |  | 
			
				
					|  | ed0558afdf | Fixed compiler warnings and moved execution environment to Java 1.8 | 2017-01-23 23:25:28 +01:00 |  | 
			
				
					|  | 89fb6629d0 | Finished version 1.0 - added relation navigation
- improved about dialog | 2015-11-15 23:17:46 +01:00 |  | 
			
				
					|  | c4fc4e20a6 | Fixed product build | 2015-11-14 11:24:34 +01:00 |  |