commit ecbd047cffa1c4af95cf4ab91a7d2fded4a5584c
Merge: dbbefcd 21259b6
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Sun Jan 8 09:06:26 2017 +0100
Merge branch 'master' into biblatex2
development/tools/alpha_lfuns.pl | 53 +
lib/doc/EmbeddedObjects.lyx | 33 +-
lib/doc/UserGuide.lyx | 35 +-
lib/lyx2lyx/lyx_2_3.py | 48 +-
src/LyXAction.cpp | 5160 ++++++++++++++++++++-----------------
src/frontends/qt4/GuiDocument.cpp | 2 +-
src/frontends/qt4/GuiRef.cpp | 10 +-
src/frontends/qt4/ui/RefUi.ui | 10 +
src/insets/InsetRef.cpp | 37 +-
src/mathed/MathMacro.cpp | 2 +-
src/tex2lyx/text.cpp | 2 +
src/version.h | 4 +-
12 files changed, 2977 insertions(+), 2419 deletions(-)
