Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 31 Dec 2010 15:16:55 +0000 (16:16 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 31 Dec 2010 15:16:55 +0000 (16:16 +0100)
commitc3f347af4ddf3cc52fe3d8e89a361746d1f5067d
tree298728225b31d2d04b65dc5e6fac57b6ecacec91
parent80a99b08bd6e0932a420e805d928dc5ae5b80f61
parentfd388a500b0c45afb1668ba28758dbc1ea5631b1
Merge branch 'master' into experimental
lib/service/servicedvb.cpp