commit a53847964dc44d15f7c83cc65dbc16fef88d54c9
Merge: 8f823ed fdf8059
Author: Juergen Spitzmueller <[email protected]>
Date:   Sun Jan 15 12:19:37 2017 +0100

    Merge branch 'master' of git.lyx.org:lyx

 lib/RELEASE-NOTES                |    2 +
 lib/configure.py                 |    1 +
 lib/languages                    |   69 +++++++++++++++++++---
 lib/layouts/amsart.layout        |    2 +-
 po/sk.gmo                        |  Bin 503639 -> 503738 bytes
 po/sk.po                         |  116 ++++++++++++++++++++++++-------------
 src/Changes.cpp                  |  110 ++++++++++++-----------------------
 src/Changes.h                    |   15 +++--
 src/Paragraph.cpp                |    6 +-
 src/Paragraph.h                  |    3 +-
 src/TextClass.cpp                |   12 ----
 src/TextClass.h                  |    6 +-
 src/TocBackend.cpp               |   56 +++++++++++++++++-
 src/TocBackend.h                 |    8 ++-
 src/frontends/qt4/Menus.cpp      |   34 +++++------
 src/frontends/qt4/TocModel.cpp   |   13 ++--
 src/frontends/qt4/qt_helpers.cpp |   42 --------------
 src/frontends/qt4/qt_helpers.h   |    4 -
 src/insets/Inset.h               |    6 ++-
 src/insets/InsetArgument.cpp     |    7 +-
 src/insets/InsetArgument.h       |    2 +-
 src/insets/InsetCaption.cpp      |    6 +-
 src/insets/InsetCaption.h        |    3 +-
 src/insets/InsetCaptionable.cpp  |    6 +-
 src/insets/InsetCaptionable.h    |    2 +-
 src/insets/InsetCitation.cpp     |    4 +-
 src/insets/InsetCitation.h       |    2 +-
 src/insets/InsetCollapsable.cpp  |    8 +-
 src/insets/InsetCollapsable.h    |    2 +-
 src/insets/InsetExternal.cpp     |    4 +-
 src/insets/InsetExternal.h       |    2 +-
 src/insets/InsetGraphics.cpp     |    4 +-
 src/insets/InsetGraphics.h       |    2 +-
 src/insets/InsetInclude.cpp      |   22 ++++----
 src/insets/InsetInclude.h        |    2 +-
 src/insets/InsetIndex.cpp        |    6 +-
 src/insets/InsetIndex.h          |    2 +-
 src/insets/InsetLabel.cpp        |    4 +-
 src/insets/InsetLabel.h          |    2 +-
 src/insets/InsetNomencl.cpp      |    4 +-
 src/insets/InsetNomencl.h        |    2 +-
 src/insets/InsetRef.cpp          |    4 +-
 src/insets/InsetRef.h            |    2 +-
 src/insets/InsetTabular.cpp      |    8 +-
 src/insets/InsetTabular.h        |    4 +-
 src/insets/InsetText.cpp         |   27 +++++----
 src/insets/InsetText.h           |   11 ++-
 src/mathed/InsetMathHull.cpp     |    6 +-
 src/mathed/InsetMathHull.h       |    2 +-
 src/mathed/MathMacroTemplate.cpp |   22 ++++----
 src/mathed/MathMacroTemplate.h   |    2 +-
 51 files changed, 376 insertions(+), 315 deletions(-)

Reply via email to