fix conflicts

Status
Not open for further replies.
O

Open Black Hole Git

Vu+ Newbie
fix conflicts

  • [DH] Makefile.am
  • [DH] RecordTimer.py
  • [DH] ServiceReference.py
  • [DH] configure.ac
  • [DH] data/keymap.xml
  • [DH] data/menu.xml
  • [DH] data/rc_models/rc_models.cfg
  • [DH] data/skin_default/icons/Makefile.am
  • [DH] data/skin_display_et8500.xml
  • [DH] data/timezone.xml
  • [DH] doc/TPM
  • [DH] lib/base/Makefile.inc
  • [DH] lib/base/ebase.cpp
  • [DH] lib/base/etpm.cpp
  • [DH] lib/base/etpm.h
  • [DH] lib/base/filepush.cpp
  • [DH] lib/base/filepush.h
  • [DH] lib/base/httpstream.cpp
  • [DH] lib/base/wrappers.cpp
  • [DH] lib/base/wrappers.h
  • [DH] lib/dvb/cahandler.cpp
  • [DH] lib/dvb/cahandler.h
  • [DH] lib/dvb/db.cpp
  • [DH] lib/dvb/dvb.cpp
  • [DH] lib/dvb/dvb.h
  • [DH] lib/dvb/dvbtime.cpp
  • [DH] lib/dvb/epgcache.cpp
  • [DH] lib/dvb/idvb.h
  • [DH] lib/dvb/pmt.cpp
  • [DH] lib/dvb/streamserver.cpp
  • [DH] lib/dvb/tstools.cpp
  • [DH] lib/dvb/tstools.h
  • [DH] lib/dvb/volume.cpp
  • [DH] lib/dvb_ci/dvbci.cpp
  • [DH] lib/dvb_ci/dvbci.h
  • [DH] lib/dvb_ci/dvbci_resmgr.cpp
  • [DH] lib/dvb_ci/dvbci_session.cpp
  • [DH] lib/dvb_ci/dvbci_session.h
  • [DH] lib/gdi/bcm.cpp
  • [DH] lib/gdi/fb.cpp
  • [DH] lib/gdi/grc.cpp
  • [DH] lib/gdi/picload.cpp
  • [DH] lib/gdi/picload.h
  • [DH] lib/network/serversocket.cpp
  • [DH] lib/network/serversocket.h
  • [DH] lib/network/socket.cpp
  • [DH] lib/network/socket.h
  • [DH] lib/python/Components/ConfigList.py
  • [DH] lib/python/Components/Converter/PliExtraInfo.py
  • [DH] lib/python/Components/FileList.py
  • [DH] lib/python/Components/InputDevice.py
  • [DH] lib/python/Components/MovieList.py
  • [DH] lib/python/Components/NimManager.py
  • [DH] lib/python/Components/SystemInfo.py
  • [DH] lib/python/Components/TimerList.py
  • [DH] lib/python/Components/TimerSanityCheck.py
  • [DH] lib/python/Components/UsageConfig.py
  • [DH] lib/python/Components/opkg.py
  • [DH] lib/python/Plugins/Extensions/CutListEditor/meta/Makefile.am
  • [DH] lib/python/Plugins/Extensions/CutListEditor/meta/plugin_cutlisteditor.xml
  • [DH] lib/python/Plugins/Extensions/DVDBurn/meta/Makefile.am
  • [DH] lib/python/Plugins/Extensions/DVDBurn/meta/dvdburn_de.jpg
  • [DH] lib/python/Plugins/Extensions/DVDBurn/meta/dvdburn_en.jpg
  • [DH] lib/python/Plugins/Extensions/DVDBurn/meta/plugin_dvdburn.xml
  • [DH] lib/python/Plugins/Extensions/DVDPlayer/meta/Makefile.am
  • [DH] lib/python/Plugins/Extensions/DVDPlayer/meta/plugin_dvdplayer.xml
  • [DH] lib/python/Plugins/Extensions/DVDPlayer/plugin.py
  • [DH] lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
  • [DH] lib/python/Plugins/Extensions/GraphMultiEPG/meta/Makefile.am
  • [DH] lib/python/Plugins/Extensions/GraphMultiEPG/meta/graphmultiepg_de.jpg
  • [DH] lib/python/Plugins/Extensions/GraphMultiEPG/meta/graphmultiepg_en.jpg
  • [DH] lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml
  • [DH] lib/python/Plugins/Extensions/Makefile.am
  • [DH] lib/python/Plugins/Extensions/MediaPlayer/meta/Makefile.am
  • [DH] lib/python/Plugins/Extensions/MediaPlayer/meta/mediaplayer_de.jpg
  • [DH] lib/python/Plugins/Extensions/MediaPlayer/meta/mediaplayer_en.jpg
  • [DH] lib/python/Plugins/Extensions/MediaPlayer/meta/plugin_mediaplayer.xml
  • [DH] lib/python/Plugins/Extensions/MediaScanner/meta/Makefile.am
  • [DH] lib/python/Plugins/Extensions/MediaScanner/meta/mediascanner_de.jpg
  • [DH] lib/python/Plugins/Extensions/MediaScanner/meta/mediascanner_en.jpg
  • [DH] lib/python/Plugins/Extensions/MediaScanner/meta/plugin_mediascanner.xml
  • [DH] lib/python/Plugins/Extensions/PicturePlayer/meta/Makefile.am
  • [DH] lib/python/Plugins/Extensions/PicturePlayer/meta/plugin_pictureplayer.xml
  • [DH] lib/python/Plugins/Extensions/PicturePlayer/ui.py
  • [DH] lib/python/Plugins/Extensions/SocketMMI/meta/Makefile.am
  • [DH] lib/python/Plugins/Extensions/SocketMMI/meta/plugin_socketmmi.xml
  • [DH] lib/python/Plugins/Extensions/TuxboxPlugins/meta/Makefile.am
  • [DH] lib/python/Plugins/Extensions/TuxboxPlugins/meta/plugin_tuxboxplugins.xml
  • [DH] lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/ciassignment.jpg
  • [DH] lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/meta/plugin_commoninterfaceassignment.xml
  • [DH] lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/defaultservicescanner.jpg
  • [DH] lib/python/Plugins/SystemPlugins/DefaultServicesScanner/meta/plugin_defaultservicesscanner.xml
  • [DH] lib/python/Plugins/SystemPlugins/DiseqcTester/meta/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/DiseqcTester/meta/diseqctester_de.jpg
  • [DH] lib/python/Plugins/SystemPlugins/DiseqcTester/meta/diseqctester_en.jpg
  • [DH] lib/python/Plugins/SystemPlugins/DiseqcTester/meta/plugin_diseqctester.xml
  • [DH] lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/FrontprocessorUpgrade/meta/plugin_frontprocessorupgrade.xml
  • [DH] lib/python/Plugins/SystemPlugins/Hotplug/meta/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/Hotplug/meta/plugin_hotplug.xml
  • [DH] lib/python/Plugins/SystemPlugins/Makefile.am
  • [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/NetworkWizard/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/NetworkWizard/meta/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/NetworkWizard/meta/networkwizard_de.jpg
  • [DH] lib/python/Plugins/SystemPlugins/NetworkWizard/meta/networkwizard_en.jpg
  • [DH] lib/python/Plugins/SystemPlugins/NetworkWizard/meta/plugin_networkwizard.xml
  • [DH] lib/python/Plugins/SystemPlugins/NetworkWizard/networkwizard.xml
  • [DH] lib/python/Plugins/SystemPlugins/OSD3DSetup/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/OSDPositionSetup/plugin.py
  • [DH] lib/python/Plugins/SystemPlugins/PositionerSetup/meta/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/PositionerSetup/meta/plugin_positionersetup.xml
  • [DH] lib/python/Plugins/SystemPlugins/PositionerSetup/meta/positionersetup.jpg
  • [DH] lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/plugin_satelliteequipmentcontrol.xml
  • [DH] lib/python/Plugins/SystemPlugins/SatelliteEquipmentControl/meta/satcontrol.jpg
  • [DH] lib/python/Plugins/SystemPlugins/Satfinder/meta/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/Satfinder/meta/plugin_satfinder.xml
  • [DH] lib/python/Plugins/SystemPlugins/Satfinder/meta/satfinder.jpg
  • [DH] lib/python/Plugins/SystemPlugins/SkinSelector/meta/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/SkinSelector/meta/plugin_skinselector.xml
  • [DH] lib/python/Plugins/SystemPlugins/SkinSelector/meta/skinselector_de.jpg
  • [DH] lib/python/Plugins/SystemPlugins/SkinSelector/meta/skinselector_en.jpg
  • [DH] lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py
  • [DH] lib/python/Plugins/SystemPlugins/SoftwareManager/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/SoftwareManager/imagewizard.xml
  • [DH] lib/python/Plugins/SystemPlugins/SoftwareManager/meta/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/SoftwareManager/meta/plugin_softwaremanager.xml
  • [DH] lib/python/Plugins/SystemPlugins/SoftwareManager/meta/softwaremanager_de.jpg
  • [DH] lib/python/Plugins/SystemPlugins/SoftwareManager/meta/softwaremanager_en.jpg
  • [DH] lib/python/Plugins/SystemPlugins/TempFanControl/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/TempFanControl/meta/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/TempFanControl/meta/plugin_tempfancontrol.xml
  • [DH] lib/python/Plugins/SystemPlugins/VideoEnhancement/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/VideoEnhancement/meta/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/VideoEnhancement/meta/plugin_videoenhancement.xml
  • [DH] lib/python/Plugins/SystemPlugins/VideoEnhancement/meta/videoenhancement_de.jpg
  • [DH] lib/python/Plugins/SystemPlugins/VideoEnhancement/meta/videoenhancement_en.jpg
  • [DH] lib/python/Plugins/SystemPlugins/VideoTune/meta/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/VideoTune/meta/plugin_videotune.xml
  • [DH] lib/python/Plugins/SystemPlugins/Videomode/meta/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/Videomode/meta/plugin_videomode.xml
  • [DH] lib/python/Plugins/SystemPlugins/Videomode/meta/videomode_de.jpg
  • [DH] lib/python/Plugins/SystemPlugins/Videomode/meta/videomode_en.jpg
  • [DH] lib/python/Plugins/SystemPlugins/WirelessLan/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/WirelessLan/meta/Makefile.am
  • [DH] lib/python/Plugins/SystemPlugins/WirelessLan/meta/plugin_wirelesslan.xml
  • [DH] lib/python/Plugins/SystemPlugins/WirelessLan/meta/wirelesslan_de.jpg
  • [DH] lib/python/Plugins/SystemPlugins/WirelessLan/meta/wirelesslan_en.jpg
  • [DH] lib/python/Screens/About.py
  • [DH] lib/python/Screens/AudioSelection.py
  • [DH] lib/python/Screens/Console.py
  • [DH] lib/python/Screens/DVD.py
  • [DH] lib/python/Screens/Hotkey.py
  • [DH] lib/python/Screens/InputBox.py
  • [DH] lib/python/Screens/InputDeviceSetup.py
  • [DH] lib/python/Screens/InstallWizard.py
  • [DH] lib/python/Screens/LocationBox.py
  • [DH] lib/python/Screens/Makefile.am
  • [DH] lib/python/Screens/MessageBox.py
  • [DH] lib/python/Screens/MovieSelection.py
  • [DH] lib/python/Screens/Satconfig.py
  • [DH] lib/python/Screens/ScanSetup.py
  • [DH] lib/python/Screens/SoftwareUpdate.py
  • [DH] lib/python/Screens/Standby.py
  • [DH] lib/python/Screens/TimerEdit.py
  • [DH] lib/python/Screens/TimerEntry.py
  • [DH] lib/python/enigma_python.i
  • [DH] lib/service/Makefile.inc
  • [DH] lib/service/iservice.h
  • [DH] lib/service/listboxservice.cpp
  • [DH] lib/service/servicedvb.cpp
  • [DH] lib/service/servicedvbrecord.cpp
  • [DH] lib/service/servicedvbrecord.h
  • [DH] lib/service/servicedvd.cpp
  • [DH] lib/service/servicedvd.h
  • [DH] lib/service/servicehdmi.h
  • [DH] lib/service/servicemp3.cpp
  • [DH] lib/service/servicemp3.h
  • [DH] lib/service/servicemp3record.cpp
  • [DH] lib/service/servicemp3record.h
  • [DH] m4/tuxbox.m4
  • [DH] main/Makefile.am
  • [DH] main/bsod.cpp
  • [DH] po/Makefile.am
  • [DH] po/ar.po
  • [DH] po/bg.po
  • [DH] po/ca.po
  • [DH] po/cs.po
  • [DH] po/da.po
  • [DH] po/de.po
  • [DH] po/el.po
  • [DH] po/en.po
  • [DH] po/es.po
  • [DH] po/et.po
  • [DH] po/fa.po
  • [DH] po/fi.po
  • [DH] po/fr.po
  • [DH] po/fy.po
  • [DH] po/he.po
  • [DH] po/hr.po
  • [DH] po/hu.po
  • [DH] po/is.po
  • [DH] po/it.po
  • [DH] po/ku.po
  • [DH] po/lt.po
  • [DH] po/lv.po
  • [DH] po/nb.po
  • [DH] po/nl.po
  • [DH] po/no.po
  • [DH] po/pl.po
  • [DH] po/pt.po
  • [DH] po/pt_BR.po
  • [DH] po/ro.po
  • [DH] po/ru.po
  • [DH] po/sk.po
  • [DH] po/sl.po
  • [DH] po/sr.po
  • [DH] po/sv.po
  • [DH] po/th.po
  • [DH] po/tr.po
  • [DH] po/uk.po
  • [DH] po/xml2po.py
  • [DH] tools/enigma2.sh.in
Author: dpeddi

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