enigma2.git/lib/python/Plugins, branch master-2011.03 Clone of git://git.opendreambox.org/git/enigma2.git before dream multimedia removed all the engima2 sources https://git.cweiske.de/enigma2.git/atom?h=master-2011.03 2011-02-23T13:13:42Z Merge branch 'master' of git.opendreambox.org:/git/enigma2 2011-02-23T13:13:42Z Fraxinas andreas.frisch@multimedia-labs.de 2011-02-23T13:13:42Z urn:sha1:d15066ea9f5412d83fb46db2974ef08646d86634 Merge branch 'bug_673_dvdburn_keyerror' 2011-02-23T13:13:24Z Fraxinas andreas.frisch@multimedia-labs.de 2011-02-23T13:13:24Z urn:sha1:102118bc5545165bb9323c5a1f053778821e8f5f Merge remote branch 'origin/acid-burn/bug_670_plugin_restartoption' 2011-02-22T19:54:54Z acid-burn acid-burn@opendreambox.org 2011-02-22T19:54:54Z urn:sha1:b4053026b1af27eee25d483cfdc33d91678479bd fix merge error (caused by the vob subtitle bug merge) 2011-02-19T14:22:59Z ghost andreas.monzner@multimedia-labs.de 2011-02-19T14:22:59Z urn:sha1:6d411cf25bf9d283ab220be1d7af72e585af74d2 Revert "servicedvd.cpp: fix merge error (caused by the vob subtitle bug merge)" 2011-02-19T14:22:06Z ghost andreas.monzner@multimedia-labs.de 2011-02-19T14:22:06Z urn:sha1:5542743a96cff0772577e445a93384d07c291b91 This reverts commit 42f5a704c8bd14f9bac30b61a76effaededc74e8. servicedvd.cpp: fix merge error (caused by the vob subtitle bug merge) 2011-02-19T14:20:42Z ghost andreas.monzner@multimedia-labs.de 2011-02-19T14:20:42Z urn:sha1:42f5a704c8bd14f9bac30b61a76effaededc74e8 PluginComponent.py/Plugin.py: better way to react on a language change. refs #670 2011-02-18T15:32:40Z acid-burn acid-burn@opendreambox.org 2011-02-18T15:32:40Z urn:sha1:df1a17b12cb9535832a8db9bcbcf213210ddca81 Merge branch 'bug_124_m2ts_support' 2011-02-16T13:31:31Z ghost andreas.monzner@multimedia-labs.de 2011-02-16T13:31:31Z urn:sha1:dec9693d8437a31dab8e4010b33b57e1476a315c Conflicts: lib/dvb/pmt.cpp lib/service/Makefile.am Merge remote branch 'origin/acid-burn/bug_670_plugin_restartoption' 2011-02-11T12:32:34Z acid-burn acid-burn@opendreambox.org 2011-02-11T12:32:34Z urn:sha1:cdb8a973f09efb2d42875d7854edba9a411719ff Merge branch 'bug_570_playback_skip_fixes_and_cleanup_ml_aholst' 2011-02-09T14:10:03Z ghost andreas.monzner@multimedia-labs.de 2011-02-09T14:10:03Z urn:sha1:7211bd40026fb8b00be038a59abcbfa29569b3ed