From: ghost <andreas.monzner@multimedia-labs.de>
Date: Wed, 16 Feb 2011 13:36:53 +0000 (+0100)
Subject: Merge branch 'bug_672_removed_pvr_device'
X-Git-Tag: experimental-2011.03~6^2~5
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/0c417aee83bac3ab0a70d5e0b3360d18b3663a23?hp=0c417aee83bac3ab0a70d5e0b3360d18b3663a23

Merge branch 'bug_672_removed_pvr_device'

Conflicts:
	lib/dvb/dvb.cpp
---