mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-28 16:01:20 +02:00
This reverts commits 01: 7c109f36dd4297499f98c25720b7622eb5d15d41 02: be39dcf90561d819be19d4a53e285733b86f2a2a 03: 2f6346c63620a88152a5936e424f50236257df55 04: 95a6a7b45f7e6e4b5addf36c72ef572c220f6509 05: ffe8a28150607dcefd2f94e8eb94fcd07cf94998 06: 7b6a945d76fa50f59fb8d2c3d37fa707ff1028fa 07: 927f09bb2de79bb318934963fcdb65c31fe17b8b 08: b9522992e9d4b7d2b0cb2b2d32a56c01b1c5df97 09: fd8a6c469b88516fa18c3b10dc87e05a687425c5 10: b530a78ffb5593d4287a5f15adad8bf239363b93 11: 25b9c4b40e17d28202d19896e4fd04efbcdaa9d5 Conflicts: src/zapit/src/frontend.cpp Signed-off-by: Thilo Graf <dbt@novatux.de> Adopted parts because of conflicts: 01: untouched/not picked - frontend_types.h: fix unused-variable 02:3c5ea6452c
frontend_types.h: fix missing name of enum typedef 03:03b5192fe3
fix transponders 04: untouched/not picked fix typo 05:61579e130a
adopt scansettings to new frontend handling 06:cde88688ca
fix multistream (thx BP for testing) 07:b019079220
DVB-T2 fix 08: b9522992e9d4b7d2b0cb2b2d32a56c01b1c5df97 cosmetics 09:414043913e
fix frontend-parameters 10: untouched/not picked Revert "Revert "frontend multistream fixes"" 11: untouched/not picked Revert "Revert "complete rebuild of frontend cmds""