| 
							
							
								 AEtHeLsYn | 37c54d733d | Merge remote-tracking branch 'refs/remotes/tvdzwan/master' Former-commit-id: 59c1c363863c950e91ac57cc2ff39a722359634b | 2016-03-13 11:49:49 +01:00 |  | 
			
				
					| 
							
							
								 AEtHeLsYn | 9db45c0ffb | Merge remote-tracking branch 'refs/remotes/tvdzwan/master' # Conflicts:
#	include/hyperion/Hyperion.h
#	libsrc/hyperion/CMakeLists.txt
#	libsrc/hyperion/Hyperion.cpp
Former-commit-id: 1144520581d4531952038d2118cb11e01bebc10e | 2016-03-09 19:25:04 +01:00 |  | 
			
				
					| 
							
							
								 redpanther | 0bc725054c | make all prios settable and make prios more consistent Former-commit-id: f1d1c35063e98389d627f3535d2a94da33a22da4 | 2016-03-08 17:31:56 +01:00 |  | 
			
				
					| 
							
							
								 redpanther | 6bef43887b | implement dispmanx forwarding a a separate dispmanx wrapper implement forwarding for amlogic grabber
Former-commit-id: 8a793d24bd083f9eca07c34ec3b222f0e54b4426 | 2016-02-24 14:34:19 +01:00 |  | 
			
				
					| 
							
							
								 redpanther | a9e8f0264a | implement proto forwarding for osxgrabber and framebuffer. prepare forwarding in amlogic and dispmanx Former-commit-id: d67fc2b7fe8877e6eadf31a8c76e4a68110c6680 | 2016-02-17 00:44:06 +01:00 |  | 
			
				
					| 
							
							
								 frostworx | defe217c89 | added optional QT5 support - LedDevicePhilipsHue needs proper fixes Former-commit-id: 7f0971ccda221933da4be836628532e7cfc7c085 | 2016-01-06 17:31:23 +01:00 |  | 
			
				
					| 
							
							
								 johan | f0c35071da | Move V4L2 grabber code to separate library Former-commit-id: f3003eb0142af3d085ccf93fff1b297ebc2321fc | 2014-02-07 21:11:50 +01:00 |  |