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

0 files changed, 0 insertions, 0 deletions