The branch, 2.0.x, has been updated.

- Log -----------------------------------------------------------------

commit ef173f22a5766a17b8b29a5cedfd589bfb9d7520
Author: Pavel Sanda <[email protected]>
Date:   Thu Jun 14 15:57:44 2012 +0200

    Backport 35e4c1c9a65.

diff --git a/src/frontends/qt4/GuiKeySymbol.cpp 
b/src/frontends/qt4/GuiKeySymbol.cpp
index b318430..5ec58c4 100644
--- a/src/frontends/qt4/GuiKeySymbol.cpp
+++ b/src/frontends/qt4/GuiKeySymbol.cpp
@@ -341,6 +341,7 @@ static int string_to_qkey(std::string const & str)
        if (str == "yacute") return Qt::Key_Yacute;
        if (str == "thorn") return Qt::Key_THORN;
        if (str == "ydiaeresis") return Qt::Key_ydiaeresis;
+       if (str == "Dead_Caron") return Qt::Key_Dead_Caron;
 
        // FIXME, correct for all these ?
        if (str == "Super_L") return Qt::Key_Super_L;
@@ -559,6 +560,7 @@ static std::string const qkey_to_string(int lkey)
        case Qt::Key_ssharp: return "ssharp";
        case Qt::Key_ydiaeresis: return "ydiaeresis";
        case Qt::Key_Bar: return "bar";
+       case Qt::Key_Dead_Caron: return "Dead_Caron";
 
        // FIXME: these ones I don't know the names of ... help !
        // what's here is basically guesses ...
diff --git a/status.20x b/status.20x
index 1343772..76cafe8 100644
--- a/status.20x
+++ b/status.20x
@@ -74,6 +74,8 @@ What's new
 
 - Improved example and layout file for Seminar slide documents (bug 7624).
 
+- Allow dead caron to be used in our key bindings (bug 8198).
+
 
 * DOCUMENTATION AND LOCALIZATION
 

-----------------------------------------------------------------------

Summary of changes:
 src/frontends/qt4/GuiKeySymbol.cpp |    2 ++
 status.20x                         |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to