|  | 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 |  | 
			
				
					| 
							
							
								 Brita Keller | 9862c14040 | Additional files missing in the last commit | 2018-09-17 16:38:27 +02:00 |  | 
			
				
					|  | 1cf00ec882 | Updated to Photon platform | 2018-09-17 16:38:24 +02:00 |  | 
			
				
					|  | dff41eceb2 | Updated version numbers | 2018-09-17 16:26:49 +02:00 |  | 
			
				
					|  | 792dcd55f3 | Fixed rendering of integral transaction attributes and updated version numbers | 2018-09-17 16:26:48 +02:00 |  | 
			
				
					|  | 7dd0a24df6 | Updated to Photon platform | 2018-07-16 13:17:43 +02:00 |  | 
			
				
					|  | cdde384ed3 | Updated version numbers | 2017-10-14 20:59:30 +02:00 |  | 
			
				
					|  | 44b13c105d | Fixed rendering of integral transaction attributes and updated version numbers | 2017-10-13 09:36:44 +02:00 |  | 
			
				
					|  | b1890eb5e1 | Updated License information and  fixed pom warning | 2017-01-23 21:41:48 +01:00 |  | 
			
				
					|  | c8a213e985 | Fixed windows icons, adjusted version numbers | 2017-01-22 15:14:03 +01:00 |  | 
			
				
					|  | 5f82700290 | Updated to Neon platform | 2017-01-22 14:05:42 +01:00 |  | 
			
				
					|  | 96d628d322 | Updated version numbers | 2015-12-02 20:35:03 +01:00 |  | 
			
				
					|  | 0007ab9322 | 4: It shoudl be possible to start SCViewer several times in parallel Task-Url: https://github.com/eyck/txviewer/issues/issue/4 | 2015-11-22 14:29:55 +01:00 |  | 
			
				
					|  | c4fc4e20a6 | Fixed product build | 2015-11-14 11:24:34 +01:00 |  | 
			
				
					|  | 7d3c37e989 | Restructured plugins | 2015-11-03 22:30:49 +01:00 |  | 
			
				
					|  | 83fd7877f2 | - added second marker - added zoom levels 1->3->10->30->...
- added waveform identification icon | 2015-10-30 13:36:27 +01:00 |  | 
			
				
					|  | c8e98b3d60 | Added E4 product and Maven build | 2015-10-22 22:12:18 +02:00 |  |