diff options
| author | Donovan Baarda <abo@minkirri.apana.org.au> | 2014-06-12 14:53:43 +1000 |
|---|---|---|
| committer | Donovan Baarda <abo@minkirri.apana.org.au> | 2014-06-12 14:53:43 +1000 |
| commit | 0669a40347ffa233bc6042b0f65d244509a61394 (patch) | |
| tree | 36a4577bdaa1ed28ca1ad222a54777012dd2dda8 /ftnoir_protocol_vjoy/ftnoir_vjoy_controls.ui | |
| parent | 72540e0a96a3120a5d02271e714aba29e136ab78 (diff) | |
| parent | 7454496476ba17ea622781d280606161581c9544 (diff) | |
Merge branch 'master' of https://github.com/opentrack/opentrack into dev/ewma2
Resolved conflicts manually in files:
ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
ftnoir_filter_ewma2/ftnoir_filter_ewma2.h
Diffstat (limited to 'ftnoir_protocol_vjoy/ftnoir_vjoy_controls.ui')
| -rw-r--r-- | ftnoir_protocol_vjoy/ftnoir_vjoy_controls.ui | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ftnoir_protocol_vjoy/ftnoir_vjoy_controls.ui b/ftnoir_protocol_vjoy/ftnoir_vjoy_controls.ui index 1a244410..2214b887 100644 --- a/ftnoir_protocol_vjoy/ftnoir_vjoy_controls.ui +++ b/ftnoir_protocol_vjoy/ftnoir_vjoy_controls.ui @@ -2,12 +2,15 @@ <ui version="4.0"> <class>UICVJoyControls</class> <widget class="QWidget" name="UICVJoyControls"> + <property name="windowModality"> + <enum>Qt::NonModal</enum> + </property> <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>228</width> - <height>64</height> + <height>69</height> </rect> </property> <property name="windowTitle"> |