Merge branch 'master' of https://github.com/OpenPLi/enigma2

Status
Not open for further replies.
O

Open Black Hole Git

Vu+ Newbie
Merge branch 'master' of https://github.com/OpenPLi/enigma2

Conflicts:
lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py

  • [DH] Navigation.py
  • [DH] RecordTimer.py
  • [DH] data/Makefile.am
  • [DH] data/hw_info/hw_info.cfg
  • [DH] data/radio-hd.mvi
  • [DH] data/rc_models/Makefile.am
  • [DH] data/rc_models/rc_models.cfg
  • [DH] data/rc_models/xsarius.png
  • [DH] data/rc_models/xsarius.xml
  • [DH] data/setup.xml
  • [DH] data/skin_default.xml
  • [DH] data/skin_default/icons/Makefile.am
  • [DH] data/skin_default/icons/hdd.png
  • [DH] data/skin_display_et8500.xml
  • [DH] data/skin_text_default.xml
  • [DH] data/skin_text_formuler1.xml
  • [DH] lib/base/httpstream.cpp
  • [DH] lib/driver/rc.cpp
  • [DH] lib/driver/rcinput.cpp
  • [DH] lib/dvb/decoder.cpp
  • [DH] lib/dvb/demux.cpp
  • [DH] lib/dvb/demux.h
  • [DH] lib/dvb/dvb.cpp
  • [DH] lib/dvb/dvb.h
  • [DH] lib/dvb/epgcache.cpp
  • [DH] lib/dvb/frontend.cpp
  • [DH] lib/dvb/metaparser.cpp
  • [DH] lib/dvb/pmt.cpp
  • [DH] lib/dvb/pmt.h
  • [DH] lib/dvb/streamserver.cpp
  • [DH] lib/dvb/streamserver.h
  • [DH] lib/dvb/teletext.cpp
  • [DH] lib/dvb/volume.cpp
  • [DH] lib/gdi/fb.cpp
  • [DH] lib/gdi/fb.h
  • [DH] lib/gdi/fblcd.cpp
  • [DH] lib/gdi/fblcd.h
  • [DH] lib/gdi/lcd.cpp
  • [DH] lib/gdi/picexif.cpp
  • [DH] lib/gdi/picexif.h
  • [DH] lib/gdi/picload.cpp
  • [DH] lib/gdi/picload.h
  • [DH] lib/gui/esubtitle.cpp
  • [DH] lib/python/Components/Converter/Streaming.py
  • [DH] lib/python/Components/EpgList.py
  • [DH] lib/python/Components/GUISkin.py
  • [DH] lib/python/Components/Harddisk.py
  • [DH] lib/python/Components/InputDevice.py
  • [DH] lib/python/Components/Lcd.py
  • [DH] lib/python/Components/Network.py
  • [DH] lib/python/Components/NimManager.py
  • [DH] lib/python/Components/RecordingConfig.py
  • [DH] lib/python/Components/Scanner.py
  • [DH] lib/python/Components/ScrollLabel.py
  • [DH] lib/python/Components/Sources/HddState.py
  • [DH] lib/python/Components/Sources/Makefile.am
  • [DH] lib/python/Components/SystemInfo.py
  • [DH] lib/python/Components/TimerSanityCheck.py
  • [DH] lib/python/Components/UsageConfig.py
  • [DH] lib/python/Plugins/Extensions/CutListEditor/plugin.py
  • [DH] lib/python/Plugins/Extensions/CutListEditor/ui.py
  • [DH] lib/python/Plugins/Extensions/DVDBurn/plugin.py
  • [DH] lib/python/Plugins/Extensions/DVDPlayer/plugin.py
  • [DH] lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
  • [DH] lib/python/Plugins/Extensions/MediaPlayer/plugin.py
  • [DH] lib/python/Plugins/Extensions/MediaPlayer/settings.py
  • [DH] lib/python/Plugins/SystemPlugins/CableScan/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/DefaultServicesScanner/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/FastScan/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/HdmiCEC/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/Hotplug/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/OSD3DSetup/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/OSDPositionSetup/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/VideoClippingSetup/plugin.py
  • [DH] lib/python/Plugins/newplugin.py
  • [DH] lib/python/Screens/About.py
  • [DH] lib/python/Screens/AudioSelection.py
  • [DH] lib/python/Screens/ChannelSelection.py
  • [DH] lib/python/Screens/Ci.py
  • [DH] lib/python/Screens/EpgSelection.py
  • [DH] lib/python/Screens/EventView.py
  • [DH] lib/python/Screens/InfoBar.py
  • [DH] lib/python/Screens/InfoBarGenerics.py
  • [DH] lib/python/Screens/InputDeviceSetup.py
  • [DH] lib/python/Screens/NetworkSetup.py
  • [DH] lib/python/Screens/ServiceInfo.py
  • [DH] lib/python/Screens/SessionGlobals.py
  • [DH] lib/python/Screens/SleepTimerEdit.py
  • [DH] lib/python/Screens/Standby.py
  • [DH] lib/python/Screens/SubservicesQuickzap.py
  • [DH] lib/python/Screens/TaskView.py
  • [DH] lib/python/Screens/TimeDateInput.py
  • [DH] lib/python/Screens/TimerEdit.py
  • [DH] lib/python/Screens/TimerEntry.py
  • [DH] lib/python/Screens/VirtualKeyBoard.py
  • [DH] lib/python/Tools/HardwareInfo.py
  • [DH] lib/python/Tools/NumericalTextInput.py
  • [DH] lib/python/enigma_python.i
  • [DH] lib/service/listboxservice.cpp
  • [DH] lib/service/servicedvb.cpp
  • [DH] lib/service/servicedvb.h
  • [DH] lib/service/servicedvbrecord.cpp
  • [DH] lib/service/servicedvbrecord.h
  • [DH] lib/service/servicedvd.cpp
  • [DH] lib/service/servicemp3.cpp
  • [DH] lib/service/servicemp3.h
  • [DH] lib/service/servicemp3record.cpp
  • [DH] main/Makefile.am
  • [DH] main/bsod.cpp
  • [DH] main/enigma-dvbtest.cpp
  • [DH] main/enigma-gdi.cpp
  • [DH] main/enigma-gui.cpp
  • [DH] main/enigma-playlist.cpp
  • [DH] main/enigma-scan.cpp
  • [DH] mytest.py
  • [DH] po/de.po
  • [DH] po/el.po
  • [DH] po/et.po
  • [DH] po/fr.po
  • [DH] po/lv.po
  • [DH] po/nb.po
  • [DH] po/pl.po
  • [DH] po/ru.po
  • [DH] po/sv.po
  • [DH] po/tr.po
Author: meo

Continue reading...
 
Status
Not open for further replies.
Back
Top