[CST] Focus 0aee7a5f08 Revert "- movieplayer: ask before stop temporary timeshift" ...

This reverts commit 3ee1d987a2.

Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: ed6816068c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)



------------------
This commit was generated by Migit

2014-10-01 16:09:46 +04:00

..

fonts

add font with simplified chinese support

2013-06-11 17:46:05 +04:00

icons

data/icons/Makefile.am: add icon_ytplay.png

2014-09-26 14:22:58 +04:00

inetradio

update radio-stations.xml (thx bazi98)

2011-02-17 11:45:52 +00:00

initial

update initial astra frontend.conf, use same config as default

2013-07-30 11:13:50 +04:00

iso-codes

Remove most exotic never seen languages from table, to cut upcoming prefered language menu; Full tab left for reference

2010-02-17 09:58:58 +00:00

lcd

optimize jpg,png size

2012-08-08 17:10:12 +02:00

license

CImageInfo: rework some parts of imageinfo

2013-11-11 00:20:10 +01:00

locale

Revert "- movieplayer: ask before stop temporary timeshift"

2014-10-01 16:09:46 +04:00

neutrino-scripts

Software update: Copy flashimage to /tmp if it is not present in this directory

2013-06-13 01:36:03 +02:00

scripts

yweb: rework, localize and enable backup/restore

2012-07-21 23:31:59 +02:00

themes

tuxbox-port: modul files added

2010-11-27 23:16:38 +00:00

cables.xml

data/cables.xml: add ziggo/upc providers

2014-09-25 16:37:21 +04:00

encoding.conf

update encoding.conf

2013-08-08 15:51:47 +02:00

Makefile.am

add basic support for DVB-T

2014-02-28 13:44:22 +04:00

mk_terrestrial_xml.pl

add basic support for DVB-T

2014-02-28 13:44:22 +04:00

providermap.xml

providermap.xml : update

2012-04-24 12:18:36 +02:00

satellites.xml

satellites.xml: update freq 12722000 as suggested by Janus

2014-06-06 19:00:25 +02:00

settingsupdate.conf

Software Update with apply the settings (Part13)

2013-01-01 15:05:21 +01:00

terrestrial.xml

add basic support for DVB-T

2014-02-28 13:44:22 +04:00

tobackup.conf

backup.sh: rename backup.list to tobackup.conf & move to /var/tuxbox/config/t (thx svenhoefer)

2011-12-06 13:33:26 +00:00