Merge branch 'master' of
authorsreichholf <stephan@reichholf.net>
Tue, 3 May 2011 20:43:01 +0000 (22:43 +0200)
committersreichholf <stephan@reichholf.net>
Tue, 3 May 2011 20:43:01 +0000 (22:43 +0200)
commit8b429f8af1e579993b941a129f4348286e4cc8ed
treeab78966ffc8914a69686a0aafce18a222784e115
parentef9e03f6bddbb0a7299a6e3f217d2c7622670f54
parente699ea86051397f9a5f4b05a34139bcf5306c23f
Merge branch 'master' of
ssh://scm.schwerkraft.elitedvb.net/scmrepos/git/enigma2-plugins/enigma2-plugins

Conflicts:
webinterface/src/WebScreens.py
74 files changed:
ardmediathek/src/plugin.py
autotimer/src/AutoTimerSettings.py
babelzapper/CONTROL/postrm
babelzapper/src/__init__.py
babelzapper/src/plugin.py
bitrateviewer/meta/plugin_bitrateviewer.xml
configure.ac
dreamirc/src/__init__.py
dreamirc/src/dreamIRCSetup.py
dreamirc/src/dreamIRCTools.py
dreamirc/src/e2account.py
dreamirc/src/e2chat.py
dreamirc/src/e2support.py
dreamirc/src/interfaces.py
dreamirc/src/ircsupport.py
dreamirc/src/locals.py
dreamirc/src/plugin.py
dreamirc/src/protocols/__init__.py
dreamirc/src/protocols/irc.py
emailclient/src/EmailConfig.py
emailclient/src/TagStrip.py
emailclient/src/__init__.py
emailclient/src/plugin.py
emailclient/src/protocol.py
emailclient/src/uu.py
epgrefresh/po/nl.po
genmetaindex.py
growlee/meta/plugin_growlee.xml
imdb/src/__init__.py
imdb/src/plugin.py
lastfm/src/LastFM.py
lastfm/src/LastFMConfig.py
lastfm/src/StreamPlayer.py
lastfm/src/__init__.py
lastfm/src/plugin.py
lastfm/src/scrobbler.py
mediadownloader/src/__init__.py
mytube/meta/plugin_mytube.xml
mytube/src/MyTubeSearch.py
mytube/src/MyTubeService.py
mytube/src/__init__.py
mytube/src/plugin.py
ncidclient/meta/plugin_ncidclient.xml
networkbrowser/Makefile.am
networkbrowser/src/AutoMount.py
networkbrowser/src/MountEdit.py
networkbrowser/src/MountManager.py
networkbrowser/src/MountView.py
networkbrowser/src/NetworkBrowser.py
networkbrowser/src/UserDialog.py
networkbrowser/src/UserManager.py
networkbrowser/src/__init__.py
networkbrowser/src/plugin.py
partnerbox/meta/plugin_partnerbox.xml
serienfilm/meta/plugin_serienfilm.xml
setpasswd/src/__init__.py
setpasswd/src/plugin.py
trafficinfo/src/__init__.py
trafficinfo/src/plugin.py
valixdcontrol/src/comp/suomi_patch
webbouqueteditor/meta/plugin_webbouqueteditor.xml
webcamviewer/src/PictureScreen.py
webcamviewer/src/WebcamViewConfig.py
webcamviewer/src/__init__.py
webcamviewer/src/plugin.py
webinterface/meta/plugin_webinterface.xml
webinterface/src/WebChilds/PlayService.py
webinterface/src/WebChilds/Screengrab.py
webinterface/src/WebChilds/Screenpage.py
webinterface/src/WebChilds/Uploader.py
webinterface/src/WebChilds/__init__.py
webinterface/src/WebScreens.py
xml2po.py
youtubeplayer/src/DirectYouTubePlayer.py