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/Components/Converter/Makefile.am

  • [DH] Navigation.py
  • [DH] data/skin_default/icons/Makefile.am
  • [DH] data/skin_default/icons/stream.png
  • [DH] data/skin_default/icons/timer_autotimer.png
  • [DH] data/skin_display_et8500.xml
  • [DH] lib/base/httpstream.cpp
  • [DH] lib/dvb/scan.cpp
  • [DH] lib/gdi/fb.cpp
  • [DH] lib/python/Components/Converter/ClientsStreaming.py
  • [DH] lib/python/Components/Converter/Makefile.am
  • [DH] lib/python/Components/GUISkin.py
  • [DH] lib/python/Components/TimerList.py
  • [DH] lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
  • [DH] lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/HdmiCEC/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
  • [DH] lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
  • [DH] lib/python/Screens/ChoiceBox.py
  • [DH] lib/python/Screens/EpgSelection.py
  • [DH] lib/python/Screens/EventView.py
  • [DH] lib/python/Screens/InfoBarGenerics.py
  • [DH] lib/python/Screens/ServiceInfo.py
  • [DH] lib/service/servicemp3.cpp
  • [DH] po/el.po
  • [DH] po/lv.po
  • [DH] po/ru.po
Author: meo

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