diff options
| author | Nick Mainsbridge <beatroute@iprimus.com.au> | 2008-10-13 01:56:42 +0000 |
|---|---|---|
| committer | Nick Mainsbridge <beatroute@iprimus.com.au> | 2008-10-13 01:56:42 +0000 |
| commit | 2f4a7917de6c6c72f388ce7a79052d3a0cc400a2 (patch) | |
| tree | 42a7583603f81bd302a1e1fe3aa9d1e93c521c0e /gtk2_ardour/mnemonic-us.bindings.in | |
| parent | 2c4a08bc5752d1453248af564ca3303c2c6e341c (diff) | |
Fit tracks fix from 2.0, don't crash if some env vars aren't set, remove some conflicts from mnemonic-us.bindings.in.
git-svn-id: svn://localhost/ardour2/branches/3.0@3943 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mnemonic-us.bindings.in')
| -rw-r--r-- | gtk2_ardour/mnemonic-us.bindings.in | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/gtk2_ardour/mnemonic-us.bindings.in b/gtk2_ardour/mnemonic-us.bindings.in index 257e0131f0..4a29f85fb0 100644 --- a/gtk2_ardour/mnemonic-us.bindings.in +++ b/gtk2_ardour/mnemonic-us.bindings.in @@ -93,20 +93,12 @@ ;; HOME ROW -<<<<<<< .working -(gtk_accel_path "<Actions>/Editor/zoom-to-region" "<%SECONDARY%>z") -======= (gtk_accel_path "<Actions>/Editor/zoom-to-region" "<%PRIMARY%><%SECONDARY%>z") (gtk_accel_path "<Actions>/Editor/zoom-to-region-both-axes" "<%SECONDARY%>z") ->>>>>>> .merge-right.r3622 (gtk_accel_path "<Actions>/Editor/undo" "<%PRIMARY%>z") (gtk_accel_path "<Actions>/Editor/toggle-zoom" "<%TERTIARY%>z") -<<<<<<< .working (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-zoom" "z") (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-note" "n") -======= -(gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-zoom" "z") ->>>>>>> .merge-right.r3622 (gtk_accel_path "<Actions>/Editor/editor-cut" "<%PRIMARY%>x") (gtk_accel_path "<Actions>/Editor/editor-copy" "<%PRIMARY%>c") (gtk_accel_path "<Actions>/Common/ToggleColorManager" "<%WINDOW%>c") |