Merge branch 'master' of https://github.com/OpenPLi/enigma2 master
authormeo <lupomeo@hotmail.com>
Tue, 12 Jan 2016 15:44:11 +0000 (16:44 +0100)
committermeo <lupomeo@hotmail.com>
Tue, 12 Jan 2016 15:44:11 +0000 (16:44 +0100)
commit3915b28d247f86f130896a8ddf5c28e67a0fa2c6
treeafd700299f77ffc51eddc12fd62a9f63507e26c7
parent44654e8866f635a5c2939774e73842bb55e9a802
parent0646f89b1733f5c60d9c6310104969a9c9338712
Merge branch 'master' of https://github.com/OpenPLi/enigma2

Conflicts:
lib/python/Components/UsageConfig.py
lib/python/Screens/About.py
14 files changed:
configure.ac
data/keymap.xml
lib/python/Components/NimManager.py
lib/python/Components/UsageConfig.py
lib/python/Components/config.py
lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py
lib/python/Screens/About.py
lib/python/Screens/ChannelSelection.py
lib/python/Screens/InfoBar.py
lib/python/Screens/InfoBarGenerics.py
lib/python/Screens/InputBox.py
lib/python/Screens/MovieSelection.py
main/enigma.cpp
skin.py