Merge branch 'bug_672_removed_pvr_device'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 16 Feb 2011 13:36:53 +0000 (14:36 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 16 Feb 2011 13:36:53 +0000 (14:36 +0100)
commit0c417aee83bac3ab0a70d5e0b3360d18b3663a23
tree4fbc37d651cd2e7e3f545b8077e64b7d69c1064d
parentdec9693d8437a31dab8e4010b33b57e1476a315c
parent2c4829db1915266f51900d5da0e98173c5b87148
Merge branch 'bug_672_removed_pvr_device'

Conflicts:
lib/dvb/dvb.cpp
lib/dvb/decoder.cpp
lib/dvb/dvb.cpp
lib/dvb/idvb.h
lib/dvb/pmt.cpp
lib/dvb/pmt.h