Revert "servicedvd.cpp: fix merge error (caused by the vob subtitle bug merge)"
[enigma2.git] / lib / python / Plugins / Extensions / DVDPlayer / src / servicedvd.cpp
2011-02-19 ghostRevert "servicedvd.cpp: fix merge error (caused by...
2011-02-19 ghostservicedvd.cpp: fix merge error (caused by the vob...
2011-02-19 ghostMerge branch 'bug_537_ignore_vob_pgs_subtitles' into...
2011-02-17 acid-burnMerge remote branch 'origin/acid-burn/bug_670_plugin_re...
2011-02-16 ghostMerge branch 'bug_672_removed_pvr_device'
2011-02-16 ghostMerge branch 'bug_672_removed_pvr_device'
2011-02-16 ghostMerge branch 'bug_124_m2ts_support'
2011-02-11 acid-burnMerge remote branch 'origin/acid-burn/bug_670_plugin_re...
2011-02-11 acid-burnMerge remote branch 'origin/pootle-import'
2011-02-09 ghostMerge branch 'bug_668_segfault_on_e2_restart_with_runni...
2011-02-09 ghostMerge branch 'bug_635_timer_sanity_check_speedup'
2011-02-09 ghostMerge branch 'bug_570_playback_skip_fixes_and_cleanup_m...
2011-02-07 FraxinasMerge branch 'bug_440_dvdplayer_audioselection'
2011-01-28 FraxinasDVDPlayer: AudioSelection integration (#441)
2011-01-28 FraxinasDVDPlayer subtitle stream selection through enigma2...
2011-01-27 Fraxinasimplement native e2 audio and subtitle track selection...
2011-01-26 acid-burnMerge remote branch 'origin/pootle-import'
2011-01-18 acid-burnMerge remote branch 'origin/acid-burn/bug_608_add_nim_s...
2010-12-20 Andreas OberritterMerge branch 'master' into obi/master
2010-12-13 ghostMerge remote branch 'remotes/origin/pootle-import'
2010-12-13 ghostMerge branch 'bug_621_caid_info'
2010-12-13 ghostMerge branch 'bug_624_change_handylike_char_input'
2010-12-13 ghostMerge remote branch 'remotes/origin/acid-burn/bug_622_s...
2010-12-13 ghostMerge remote branch 'remotes/origin/bug_620_dvdburn_abs...
2010-12-13 ghostMerge remote branch 'remotes/origin/acid-burn/bug_629_s...
2010-12-13 ghostMerge remote branch 'remotes/origin/acid-burn/bug_439_d...
2010-12-03 acid-burnExtensions/DVDPlayer: add ".img" file extension to...
2010-11-25 acid-burnDVDPlayer/src/servicedvd.cpp: add possibility to overri...
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-05 acid-burnMerge commit 'origin/bug_478_Listbox_ScrollbarMode'
2010-09-01 FraxinasMerge remote branch 'origin/bug_429_remove_hardcoded_pa...
2010-04-09 FraxinasMerge branch 'experimental' of git.opendreambox.org...
2010-03-31 acid-burnMerge commit 'origin/translations'
2010-03-31 acid-burnMerge commit 'origin/translations' into experimental
2010-03-31 acid-burnMerge commit 'origin/bug_448_fix_wlanscan'
2010-03-31 acid-burnMerge commit 'origin/bug_449_fix_wlan_usbstick_recognition'
2010-03-31 acid-burnMerge commit 'origin/bug_494_disable_automatic_ipkgupdate'
2010-03-31 acid-burnMerge commit 'origin/translations' into experimental
2010-03-31 ghostlib/python/Plugins/Extensions/DVDPlayer/src/servicedvd...
2010-03-30 Stefan PlueckenMerge branch 'experimental' of git.opendreambox.org...
2010-03-29 ghostlib/python/Plugins/Extensions/DVDPlayer/src/servicedvd...
2010-01-06 acid-burnMerge commit 'origin/translations' into experimental
2010-01-05 ghostMerge remote branch 'remotes/origin/fantempplugin'
2010-01-05 Stefan PlueckenMerge branch 'master' of git.opendreambox.org:/git...
2010-01-04 acid-burnMerge commit 'origin/translations' into experimental
2010-01-02 ghostMerge remote branch 'origin/bug_306_sort_by_date' into...
2010-01-02 ghostMerge remote branch 'origin/bug_306_sort_by_date'
2010-01-02 ghostMerge remote branch 'origin/bug_319_dvdburnsettings_lan...
2010-01-02 ghostMerge remote branch 'origin/bug_348_dvdburn_residenttas...
2010-01-02 ghostMerge remote branch 'origin/bug_348_dvdburn_residenttask'
2010-01-02 ghostMerge remote branch 'origin/bug_135_dvdburn_ts_only'
2010-01-02 ghostMerge remote branch 'origin/bug_112_enable_extensions_m...
2010-01-02 ghostMerge branch 'bug_274_disable_fast_winding_for_non_ts'
2009-12-31 acid-burnMerge commit 'origin/bug_112_enable_extensions_manager...
2009-12-30 ghostMerge branch 'bug_293_indicate_unhandled_key' into...
2009-12-30 ghostMerge branch 'bug_262_no_more_ask_50hz' into experimental
2009-12-29 acid-burnMerge commit 'origin/translations' into experimental
2009-12-29 acid-burnMerge commit 'origin/bug_112_enable_extensions_manager...
2009-12-29 acid-burnMerge commit 'origin/bug_112_enable_extensions_manager...
2009-12-28 acid-burnMerge branch 'translations' into experimental
2009-12-28 acid-burnMerge commit 'origin/bug_112_enable_extensions_manager...
2009-12-23 ghostMerge remote branch 'remotes/origin/bug_135_dvdburn_ts_...
2009-12-23 ghostMerge remote branch 'remotes/origin/bug_333_dvdburn_mov...
2009-12-23 ghostMerge remote branch 'remotes/origin/bug_319_dvdburnsett...
2009-12-22 ghostMerge commit 'e8eb8e9694379204' into experimental
2009-12-17 acid-burnMerge commit 'origin/bug_202_networkconfig_cleanup...
2009-12-17 acid-burnMerge commit 'origin/bug_203_fix_wrong_networkstate...
2009-12-15 acid-burnMerge commit 'origin/bug_203_fix_wrong_networkstate...
2009-12-11 thedocMerge branch 'fantempplugin' into experimental
2009-12-11 thedocMerge branch 'fantempplugin' into experimental
2009-12-11 thedocMerge branch 'fantempplugin' into experimental
2009-12-11 Mladen HorvatMerge branch 'bug_202_networkconfig_cleanup' into exper...
2009-12-11 Mladen HorvatMerge branch 'translations' into experimental
2009-12-10 Mladen HorvatMerge commit 'origin/bug_202_networkconfig_cleanup...
2009-12-09 Mladen HorvatMerge commit 'origin/bug_138_networkwizard_fixes' into...
2009-12-09 ghostMerge branch 'bug_263_fix_timeshift_live_transition...
2009-12-09 Mladen HorvatMerge commit 'origin/bug_351_softwaremanager_save_confi...
2009-12-08 Mladen HorvatMerge commit 'origin/bug_204_wlan_automatic_scanning...
2009-12-07 Mladen HorvatMerge branch 'experimental' of acidburn@git.opendreambo...
2009-12-03 ghostdisable fast winding for non TS mediafiles until we...
2009-11-06 ghostRevert "disable fast winding for non TS mediafiles...
2009-11-06 ghostMerge branch 'experimental' of git://git.opendreambox...
2009-11-05 ghostMerge branch 'bug_274_disable_fast_winding_for_non_ts...
2009-11-05 ghostdisable fast winding for non TS mediafiles until we...
2009-07-17 Felix DomkeMerge branch 'master' of git.opendreambox.org:/git...
2009-07-17 ghostMerge branch 'master' of git.opendreambox.org:/git...
2009-07-17 ghostwe need policy2 in libdreamdvd for 16:10 support
2009-07-16 Felix DomkeMerge branch 'master' of git.opendreambox.org:/git...
2009-07-16 Felix Domkecorrect y_offset from libdreamdvd
2009-06-11 ghostMerge branch 'master' of git.opendreambox.org:/git...
2009-06-11 ghostservicedvd.h/cpp: small fixes
2009-06-09 Felix DomkeMerge branch 'master' of git.opendreambox.org:/git...
2009-06-08 Felix Domkesupport new libdreamdvd, and do scaling in subtitle...
2009-06-03 Felix DomkeMerge branch 'master' of git.opendreambox.org:/git...
2009-06-03 Felix Domkeuse 720x576 subtitle pixmap, and scale to fullscreen
2009-04-06 Felix DomkeMerge branch 'master' of /home/tmbinc/enigma2-git
2009-04-06 Felix Domkereplace assert by ASSERT, so a proper log message is...
2009-03-31 Felix DomkeMerge commit 'origin/master' into tmbinc/FixTimingBugs
next