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

..

api

Discovery VideoSources and Dynamically Update Editor

2021-02-14 11:39:03 +01:00

blackborder

Various Cleanups (#1075)

2020-11-14 17:58:56 +01:00

boblightserver

Const correctness, override keyword, a bunch of stuff..

2020-08-08 23:12:43 +02:00

bonjour

Various Cleanups (#1075)

2020-11-14 17:58:56 +01:00

cec

Feature/CEC detection (#877)

2020-07-20 20:06:41 +02:00

commandline

Various Cleanups (#1075)

2020-11-14 17:58:56 +01:00

db

Read-Only Configuration-Database support (#1046)

2020-11-01 19:47:30 +01:00

effectengine

Fix 1181 - Effects were not started from tray (#1199)

2021-03-19 22:52:41 +01:00

flatbufserver

ENABLE_AVAHI is not included in WebServer

2020-09-08 20:39:28 +02:00

grabber

Merge remote-tracking branch 'origin/grabberDiscovery' into mediafoundation

2021-05-02 20:12:52 +02:00

hyperion

Merge branch 'master' into mediafoundation

2021-05-02 21:12:00 +02:00

jsonserver

Const correctness, override keyword, a bunch of stuff..

2020-08-08 23:12:43 +02:00

leddevice

Dynamic Device Selection/Configuration (#1164)

2021-04-24 19:37:29 +02:00

protoserver

Pass primitive types by value (#935)

2020-08-08 13:09:15 +02:00

python

Merge pull request #946 from m-seker/refactor/python

2020-08-31 21:10:07 +02:00

ssdp

Various Cleanups (#1075)

2020-11-14 17:58:56 +01:00

utils

Merge branch 'master' into mediafoundation

2021-05-02 21:12:00 +02:00

webserver

Various Cleanups (#1075)

2020-11-14 17:58:56 +01:00