Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 11 Aug 2009 17:28:41 +0000 (19:28 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 11 Aug 2009 17:28:41 +0000 (19:28 +0200)
1  2 
lib/service/servicedvb.cpp

Simple merge