diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-06 05:13:23 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-06 05:13:23 +0200 |
| commit | 58ceabb21192742a46c9edf321459e54de23f0aa (patch) | |
| tree | fc2ca5528f9dee68aa9013fb1b7424cd54bf45b1 /ftnoir_protocol_mouse/ftnoir_protocol_mouse.h | |
| parent | 873667c7b59aeb02ffc813630736c87b11664c9b (diff) | |
| parent | 0f7a4ba62369a42cf6b513ce0fa59d117551f0ed (diff) | |
Merge branch 'unstable' into trackhat-ui
* unstable:
ui: sort combobox items according to their name, not filename
mouse: remove GPL, has since been rewritten
mouse: decruft
freetrack: new game definitions
Diffstat (limited to 'ftnoir_protocol_mouse/ftnoir_protocol_mouse.h')
| -rw-r--r-- | ftnoir_protocol_mouse/ftnoir_protocol_mouse.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h index 95b5f72c..595be393 100644 --- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h +++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h @@ -9,7 +9,6 @@ #include "ui_ftnoir_mousecontrols.h" #include <QDebug> -#include <windows.h> #include "opentrack/plugin-api.hpp" #include "opentrack/options.hpp" using namespace options; |