rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-30 15:52:12 +01:00
Code Issues Releases Activity

Merge branch 'master' into OP-367_UAVObject_Query

Browse Source
This commit is contained in:
elafargue 2011-05-02 09:14:21 +02:00
commit 2c89d34e2a
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ground/openpilotgcs/src/plugins/notify/notifyplugin.h
View File

@ -35,7 +35,10 @@
#include "notifypluginconfiguration.h" #include "notifypluginconfiguration.h"
#include <QSettings> #include <QSettings>
#include <phonon> #include <Phonon/MediaObject>
#include <Phonon/Path>
#include <Phonon/AudioOutput>
#include <Phonon/Global>
class NotifyPluginOptionsPage; class NotifyPluginOptionsPage;

5
ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.h
View File

@ -38,7 +38,10 @@
#include <QItemSelectionModel> #include <QItemSelectionModel>
#include <QDebug> #include <QDebug>
#include <QtCore/QSettings> #include <QtCore/QSettings>
#include <phonon> #include <Phonon/MediaObject>
#include <Phonon/Path>
#include <Phonon/AudioOutput>
#include <Phonon/Global>
class NotifyTableModel; class NotifyTableModel;