LordGrey 9ea40a873e Merge branch 'master' into mediafoundation ... # Conflicts: # assets/webconfig/content/dashboard.html # assets/webconfig/i18n/en.json # assets/webconfig/js/content_dashboard.js # assets/webconfig/js/content_logging.js # assets/webconfig/js/hyperion.js # assets/webconfig/js/ui_utils.js		2021-05-02 21:12:00 +02:00
..
AuthManager.h	Various Cleanups (#1075)	2020-11-14 17:58:56 +01:00
BGEffectHandler.h	Stop background effect, when it gets out of scope (#1226)	2021-04-25 16:50:27 +02:00
CaptureCont.h	Pass primitive types by value (#935)	2020-08-08 13:09:15 +02:00
ColorAdjustment.h	Const correctness, override keyword, a bunch of stuff..	2020-08-08 23:12:43 +02:00
ComponentRegister.h	Const correctness, override keyword, a bunch of stuff..	2020-08-08 23:12:43 +02:00
Grabber.h	Merge remote-tracking branch 'origin/grabberDiscovery' into mediafoundation	2021-05-02 20:12:52 +02:00
GrabberWrapper.h	Merge remote-tracking branch 'origin/grabberDiscovery' into mediafoundation	2021-05-02 20:12:52 +02:00
Hyperion.h	Merge remote-tracking branch 'origin/grabberDiscovery' into mediafoundation	2021-05-02 20:12:52 +02:00
HyperionIManager.h	Read-Only Configuration-Database support (#1046)	2020-11-01 19:47:30 +01:00
ImageProcessor.h	Various Cleanups (#1075)	2020-11-14 17:58:56 +01:00
ImageToLedsMap.h	Various Cleanups (#1075)	2020-11-14 17:58:56 +01:00
LedString.h	Various Cleanups (#1075)	2020-11-14 17:58:56 +01:00
MessageForwarder.h	Const correctness, override keyword, a bunch of stuff..	2020-08-08 23:12:43 +02:00
MultiColorAdjustment.h	Various Cleanups (#1075)	2020-11-14 17:58:56 +01:00
PriorityMuxer.h	Fix 1181 - Effects were not started from tray (#1199)	2021-03-19 22:52:41 +01:00
SettingsManager.h	Dynamic Device Selection/Configuration (#1164)	2021-04-24 19:37:29 +02:00