redpanther c7df8c23c6 Merge remote-tracking branch 'upstream/master/master' into hyperion_version_id ... Conflicts: src/hyperion-aml/CMakeLists.txt src/hyperion-remote/CMakeLists.txt src/hyperion-v4l2/CMakeLists.txt Former-commit-id: d34fbdd65e7c95bafe43396e1ccef7ad30def7fb		2016-03-13 08:04:49 +01:00
..
CMakeLists.txt	Merge remote-tracking branch 'upstream/master/master' into hyperion_version_id	2016-03-13 08:04:49 +01:00
PixelFormatParameter.h	Extract ImageResampler from X11Grabber	2014-12-14 14:26:59 +01:00
ScreenshotHandler.cpp	Create image callback using Qt signal	2014-02-19 21:52:37 +01:00
ScreenshotHandler.h	Create image callback using Qt signal	2014-02-19 21:52:37 +01:00
VideoStandardParameter.h	Merge branch 'master' into merge_v4l2	2014-02-23 21:53:13 +01:00
hyperion-v4l2.cpp	Merge remote-tracking branch 'upstream/master/master' into hyperion_version_id	2016-03-13 08:04:49 +01:00