diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-26 07:10:49 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-26 07:10:49 +0100 |
| commit | 20f83ad3149237087d2d0a81a27e6d511a5e7973 (patch) | |
| tree | 3aaf2bc964a026292451efaa553744165d3e1c93 /facetracknoir/settings.ui | |
| parent | a815d8dfe1b452e0cab9b588a9d4ec4650a5bdda (diff) | |
| parent | 8f7e5c0441237a9c8c187f24a424f6c77c5e397e (diff) | |
Merge branch 'unstable' into trackhat
* unstable:
main: use camera-based centering by default
settings: clarify center method usage
accela: fix typo
win32: try win_key with modifier first
shortcuts: remove obsolete code on win32
shortcuts: allow for numpad on win32
qfc: drop nan check
pt: drop nan check
shortcuts: allow for numlock on win32
accela: remove too many nan checks
timer: guard against overflow on win32
accela: remove "done" logic
timer: sprinkle some const
shortcuts: allow for binding same key to multiple functions
qfc: guard against unlikely division by zero
cmake: update toolchain file
Diffstat (limited to 'facetracknoir/settings.ui')
| -rw-r--r-- | facetracknoir/settings.ui | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/facetracknoir/settings.ui b/facetracknoir/settings.ui index 5ab857db..0810fd98 100644 --- a/facetracknoir/settings.ui +++ b/facetracknoir/settings.ui @@ -157,12 +157,12 @@ <widget class="QComboBox" name="center_method"> <item> <property name="text"> - <string>Relative</string> + <string>Relative (inertial device)</string> </property> </item> <item> <property name="text"> - <string>Absolute</string> + <string>Absolute (camera device)</string> </property> </item> </widget> |