Merge branch 'bug_411_timeshift_disable_without_live'
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 12 Feb 2010 13:23:06 +0000 (14:23 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 12 Feb 2010 13:23:06 +0000 (14:23 +0100)
commita37ddbb7785de5f1d944f4937a5b2914ce6a3862
treee3fc570edabdb51535361ce8a31bc117a913762d
parentae12f5e4894a65289aeafd97931e1651939bf8b1
parent83a674f998012f616a3ed7e7b7043e498fd93e09
Merge branch 'bug_411_timeshift_disable_without_live'
lib/service/servicedvb.cpp