meta/plugin_graphmultiepg.xml: fix merge conflict
[enigma2.git] / lib / python / Components / InputDevice.py
2010-10-06 ghostMerge remote branch 'origin/bug_347_adenin_unicable_xml'
2010-10-06 ghostMerge branch 'bug_539_add_multicontent_pixmap_progress'
2010-10-06 ghostMerge branch 'bug_538_ignore_global_actions_in_standby'
2010-10-06 ghostMerge branch 'bug_533_fix_crash_on_satconfig_close'
2010-10-06 ghostMerge branch 'bug_532_fixed_servicelist_contextmenu_crash'
2010-10-06 ghostMerge branch 'bug_531_fixed_not_visible_parental_contro...
2010-10-06 ghostMerge remote branch 'origin/bug_530_add_dm800se_support'
2010-10-06 ghostMerge branch 'bug_518_add_demux_reserve_from_python'
2010-10-06 ghostMerge branch 'bug_514_new_proc_oled_brightness_path'
2010-10-06 ghostMerge branch 'bug_487_service_selection_event_text_color'
2010-10-06 ghostMerge branch 'bug_486_add_service_event_progress_to_ser...
2010-10-06 ghostMerge branch 'bug_474_fix_multicontent_clear'
2010-10-06 ghostMerge branch 'bug_300_fix_arabic'
2010-10-05 acid-burnMerge commit 'origin/bug_578_translateable_meta_descrip...
2010-10-05 acid-burnMerge commit 'origin/bug_563_fix_backuprestore_crash'
2010-10-05 acid-burnMerge commit 'origin/bug_69_configurable_inputdevice_delay'
2010-08-26 acid-burnEnigma2: add possibility to configure input device...
2006-10-02 Felix Domkeconfig rewrite. some extensions still need to be updated.
2006-02-27 Stefan Pluecken- add positioner plugin (just basic gui atm)
2005-09-03 Ronny StrutzconfigBoolean is now configSelection
2005-09-01 Ronny Strutzremoved debug output
2005-08-28 Ronny Strutzadded setup screens
2005-08-17 Ronny Strutzfixes
2005-08-16 Ronny Strutzfixed
2005-08-16 Ronny Strutzstart of inputdevice controls