Skip to content

Q
qgroundcontrol
Commit 34072b0b authored by pixhawk's avatar pixhawk
Browse files
Options

Merge branch 'experimental' of pixhawk.ethz.ch:qgroundcontrol into experimental

parents 5c42780c 060a6f42
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/GAudioOutput.h
View file @ 34072b0b
...@@ -40,8 +40,8 @@ This file is part of the PIXHAWK project ...@@ -40,8 +40,8 @@ This file is part of the PIXHAWK project
#endif #endif
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
//#include <flite/flite.h> //#include <flite/flite.h>
#include <phonon/MediaObject> #include <Phonon/MediaObject>
#include <phonon/AudioOutput> #include <Phonon/AudioOutput>
#endif #endif
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include <Phonon/MediaObject> #include <Phonon/MediaObject>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment