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:
configure.ac
lib/python/Components/NimManager.py

  • [DH] RecordTimer.py
  • [DH] configure.ac
  • [DH] keymapparser.py
  • [DH] lib/actions/action.cpp
  • [DH] lib/actions/action.h
  • [DH] lib/base/Makefile.inc
  • [DH] lib/dvb/Makefile.inc
  • [DH] lib/dvb/demux.h
  • [DH] lib/dvb/dvb.cpp
  • [DH] lib/dvb/dvb.h
  • [DH] lib/dvb/filepush.cpp
  • [DH] lib/dvb/filepush.h
  • [DH] lib/dvb/frontend.cpp
  • [DH] lib/network/serversocket.cpp
  • [DH] lib/python/Components/Converter/ClientsStreaming.py
  • [DH] lib/python/Components/NimManager.py
  • [DH] lib/python/Components/ServiceScan.py
  • [DH] lib/python/Components/UsageConfig.py
  • [DH] lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
  • [DH] lib/python/Screens/ChannelSelection.py
  • [DH] lib/python/Screens/InfoBarGenerics.py
  • [DH] lib/python/Screens/MovieSelection.py
  • [DH] lib/python/Screens/PictureInPicture.py
  • [DH] lib/python/Screens/Satconfig.py
  • [DH] lib/python/Screens/SubservicesQuickzap.py
  • [DH] lib/service/servicedvb.h
  • [DH] lib/service/servicemp3.cpp
  • [DH] lib/service/servicemp3.h
  • [DH] main/Makefile.am
  • [DH] mytest.py
  • [DH] po/el.po
  • [DH] po/fr.po
  • [DH] po/lv.po
  • [DH] po/nb.po
  • [DH] po/ru.po
  • [DH] po/tr.po
Author: meo

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