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/UsageConfig.py
lib/python/Screens/About.py

  • [DH] configure.ac
  • [DH] data/Makefile.am
  • [DH] data/keymap.xml
  • [DH] data/rc_models/rc_models.cfg
  • [DH] data/skin_default.xml
  • [DH] data/skin_display_dm800se.xml
  • [DH] data/skin_display_et8500.xml
  • [DH] data/skin_display_vusolo4k.xml
  • [DH] enigma2.bb
  • [DH] lib/base/cfile.cpp
  • [DH] lib/base/cfile.h
  • [DH] lib/python/Components/AVSwitch.py
  • [DH] lib/python/Components/Converter/ClientsStreaming.py
  • [DH] lib/python/Components/Converter/EventName.py
  • [DH] lib/python/Components/Converter/FrontendInfo.py
  • [DH] lib/python/Components/Converter/PliExtraInfo.py
  • [DH] lib/python/Components/Converter/RotorPosition.py
  • [DH] lib/python/Components/Converter/ServiceInfo.py
  • [DH] lib/python/Components/Converter/ServiceName.py
  • [DH] lib/python/Components/Converter/StaticText.py
  • [DH] lib/python/Components/Converter/TransponderInfo.py
  • [DH] lib/python/Components/Converter/ValueToPixmap.py
  • [DH] lib/python/Components/HTMLComponent.py
  • [DH] lib/python/Components/HTMLSkin.py
  • [DH] lib/python/Components/InputDevice.py
  • [DH] lib/python/Components/Keyboard.py
  • [DH] lib/python/Components/Label.py
  • [DH] lib/python/Components/Lcd.py
  • [DH] lib/python/Components/MovieList.py
  • [DH] lib/python/Components/Netlink.py
  • [DH] lib/python/Components/NimManager.py
  • [DH] lib/python/Components/ParentalControl.py
  • [DH] lib/python/Components/Playlist.py
  • [DH] lib/python/Components/Renderer/ChannelNumber.py
  • [DH] lib/python/Components/Renderer/Label.py
  • [DH] lib/python/Components/Renderer/NextEpgInfo.py
  • [DH] lib/python/Components/Renderer/Pig.py
  • [DH] lib/python/Components/Renderer/Pixmap.py
  • [DH] lib/python/Components/Renderer/VideoSize.py
  • [DH] lib/python/Components/ResourceManager.py
  • [DH] lib/python/Components/ServiceList.py
  • [DH] lib/python/Components/Sources/CurrentService.py
  • [DH] lib/python/Components/Sources/EventInfo.py
  • [DH] lib/python/Components/Sources/FrontendStatus.py
  • [DH] lib/python/Components/Sources/Source.py
  • [DH] lib/python/Components/SystemInfo.py
  • [DH] lib/python/Components/TuneTest.py
  • [DH] lib/python/Components/UsageConfig.py
  • [DH] lib/python/Components/VideoWindow.py
  • [DH] lib/python/Components/config.py
  • [DH] lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py
  • [DH] lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py
  • [DH] lib/python/Plugins/Extensions/DVDPlayer/__init__.py
  • [DH] lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
  • [DH] lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpgSetup.py
  • [DH] lib/python/Plugins/Extensions/MediaPlayer/__init__.py
  • [DH] lib/python/Plugins/Extensions/PicturePlayer/ui.py
  • [DH] lib/python/Plugins/Extensions/SocketMMI/SocketMMI.py
  • [DH] lib/python/Plugins/Extensions/SocketMMI/__init__.py
  • [DH] lib/python/Plugins/Extensions/SocketMMI/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/FastScan/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/__init__.py
  • [DH] lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/plugin_frontprocessorupgrade.xml
  • [DH] lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/NFIFlash/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/NFIFlash/__init__.py
  • [DH] lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
  • [DH] lib/python/Plugins/SystemPlugins/NFIFlash/flash.png
  • [DH] lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py
  • [DH] lib/python/Plugins/SystemPlugins/NFIFlash/meta/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/NFIFlash/meta/nfiflash_de.jpg
  • [DH] lib/python/Plugins/SystemPlugins/NFIFlash/meta/nfiflash_en.jpg
  • [DH] lib/python/Plugins/SystemPlugins/NFIFlash/meta/plugin_nfiflash.xml
  • [DH] lib/python/Plugins/SystemPlugins/NFIFlash/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
  • [DH] lib/python/Plugins/SystemPlugins/OSD3DSetup/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/SoftwareManager/ImageWizard.py
  • [DH] lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/VideoEnhancement/VideoEnhancement.py
  • [DH] lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
  • [DH] lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py
  • [DH] lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
  • [DH] lib/python/Screens/About.py
  • [DH] lib/python/Screens/ChannelSelection.py
  • [DH] lib/python/Screens/ClockDisplay.py
  • [DH] lib/python/Screens/ConfigMenu.py
  • [DH] lib/python/Screens/EpgSelection.py
  • [DH] lib/python/Screens/FactoryReset.py
  • [DH] lib/python/Screens/Hotkey.py
  • [DH] lib/python/Screens/InfoBar.py
  • [DH] lib/python/Screens/InfoBarGenerics.py
  • [DH] lib/python/Screens/InputBox.py
  • [DH] lib/python/Screens/LocationBox.py
  • [DH] lib/python/Screens/MinuteInput.py
  • [DH] lib/python/Screens/MovieSelection.py
  • [DH] lib/python/Screens/Mute.py
  • [DH] lib/python/Screens/NetworkSetup.py
  • [DH] lib/python/Screens/PVRState.py
  • [DH] lib/python/Screens/Satconfig.py
  • [DH] lib/python/Screens/ScanSetup.py
  • [DH] lib/python/Screens/ServiceStopScreen.py
  • [DH] lib/python/Screens/SimpleSummary.py
  • [DH] lib/python/Screens/SleepTimerEdit.py
  • [DH] lib/python/Screens/TimerEntry.py
  • [DH] lib/python/Tools/Alternatives.py
  • [DH] lib/python/Tools/Directories.py
  • [DH] lib/python/Tools/Downloader.py
  • [DH] lib/python/Tools/TextBoundary.py
  • [DH] lib/python/Tools/Transponder.py
  • [DH] lib/python/enigma_py_patcher.py
  • [DH] main/enigma.cpp
  • [DH] mytest.py
  • [DH] po/et.po
  • [DH] po/fr.po
  • [DH] po/pl.po
  • [DH] po/ru.po
  • [DH] skin.py
  • [DH] tools/host_tools/FormatConverter/datasource.py
  • [DH] tools/host_tools/FormatConverter/input.py
  • [DH] tools/host_tools/FormatConverter/lamedb2satxml.py
  • [DH] tools/host_tools/FormatConverter/main.py
  • [DH] tools/host_tools/FormatConverter/satxml.py
Author: meo

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