diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-16 19:07:34 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-16 19:07:34 +0200 |
| commit | 2908b6cc9dfa14ea1c0888dbf79776a2a1a02d87 (patch) | |
| tree | 91128e3250f491af7c6b25d76e7654b976d74a5d /ftnoir_tracker_aruco/aruco-trackercontrols.ui | |
| parent | 67778fef9fbaa62ab68a79e38567763bbd5b228c (diff) | |
| parent | 28deb29d72809b009b83dd8365fbae3043684f14 (diff) | |
Merge branch 'unstable' into trackhat
* unstable:
win32-shortcuts: drop null keycode
accela: drop NaN/+-inf values
Diffstat (limited to 'ftnoir_tracker_aruco/aruco-trackercontrols.ui')
0 files changed, 0 insertions, 0 deletions