commit 23c231c761dda80d220927c15e15c14493a57bc2
Merge: 78eb821 4590f10
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Thu Jan 5 14:30:26 2017 +0100

    Merge branch 'master' into biblatex2

 lib/doc/de/Additional.lyx         |   17 +--
 lib/lyx2lyx/lyx_2_3.py            |   16 ++-
 src/frontends/qt4/GuiDocument.cpp |   46 +++++--
 src/frontends/qt4/GuiDocument.h   |    2 +
 src/frontends/qt4/Menus.cpp       |  256 +++++++++++++------------------------
 src/frontends/qt4/ui/RefUi.ui     |    6 +
 src/insets/InsetQuotes.cpp        |  197 ++++++++++++++++++++---------
 src/insets/InsetQuotes.h          |   21 +++-
 src/mathed/InsetMathScript.cpp    |    9 +-
 9 files changed, 312 insertions(+), 258 deletions(-)

Reply via email to