Commit Graph

7 Commits

Author SHA1 Message Date
Thilo Graf
2e8c700dd2 Merge branch 'master' into pu/msgbox
Conflicts:
    	src/gui/followscreenings.cpp
2016-11-15 19:49:27 +01:00
svenhoefer
d6cb1d206f - followscreenings: allow to turn off followscreenings list 2016-11-14 22:58:43 +01:00
Thilo Graf
e19536fe99 Includes: remove unused includes 2016-10-26 10:25:07 +02:00
svenhoefer
56e668ae95 - followscreenings: don't show menu if just one event is found 2016-10-25 22:40:50 +02:00
martii
2cebd62aee timerd/timermanager: fix EPG auto-adjustment of recordings 2016-09-26 13:04:48 +02:00
martii
c07b0f0b6c timerd: adjust recording timers to epg 2016-09-26 13:04:48 +02:00
martii
61105699d4 - followscreenings: port code from martiis-neutrino-mp 2016-07-01 15:26:06 +02:00