The branch, 2.0.x, has been updated.
- Log -----------------------------------------------------------------
commit a96e49ef62c9547d631797f896d34de54cdd9bc4
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Wed May 23 00:47:48 2012 +0200
stdcontext.inc: fix 2 shortcut clashes (bug #8023)
diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index a8cf62e..a1d402e 100644
--- a/lib/ui/stdcontext.inc
+++ b/lib/ui/stdcontext.inc
@@ -311,7 +311,7 @@ Menuset
OptItem "Reject Change|j" "change-reject"
Separator
Item "Apply Last Text Style|A" "textstyle-apply"
- Submenu "Text Style|S" "edit_textstyles"
+ Submenu "Text Style|x" "edit_textstyles"
Item "Paragraph Settings...|P" "layout-paragraph"
LanguageSelector
Separator
@@ -593,7 +593,7 @@ Menuset
#
Menu "context-ert"
# repeat 1 is added as a work-around to not indicate this
action as toggable
- Item "Wrap by Preview|P" "command-sequence repeat
1;inset-toggle;char-forward;char-backward;char-forward-select;preview-insert;char-backward;char-backward;inset-toggle"
+ Item "Wrap by Preview|y" "command-sequence repeat
1;inset-toggle;char-forward;char-backward;char-forward-select;preview-insert;char-backward;char-backward;inset-toggle"
End
#
-----------------------------------------------------------------------
Summary of changes:
lib/ui/stdcontext.inc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
The LyX Source Repository
