1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00

* Merge master into phonon branch. Fixes compiling on Arch Linux.

This commit is contained in:
Christian Muehlhaeuser
2011-03-04 09:02:26 +01:00
parent 4c46055e88
commit d745bd5d56

View File

@@ -3,8 +3,8 @@
#include <QObject>
#include <Phonon/MediaObject>
#include <Phonon/AudioOutput>
#include <MediaObject>
#include <AudioOutput>
#include "result.h"
#include "typedefs.h"