summaryrefslogtreecommitdiff
path: root/scene/main/timer.h
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-01-25 23:11:22 +0100
committerGitHub <noreply@github.com>2018-01-25 23:11:22 +0100
commit51060a36513507593a7db67e839f1beba9f98c40 (patch)
treeb52bc9a8dd9a9954cfb1cbe2cee2944400efa50e /scene/main/timer.h
parent018168153fcfecea5ae81f4b106a497d4b17dfd5 (diff)
parent72901936cc3470dd65832a1631ee4bec7c1e5239 (diff)
Merge pull request #16062 from icnikerazah/keyboard_shortcut_conflict
Fixes The "script_text_editor/clone_down" shortcut that conflicts with the "editor/play" shortcut on macOS
Diffstat (limited to 'scene/main/timer.h')
0 files changed, 0 insertions, 0 deletions