commit 322808281ff449c542295c8e07d5b6c4c950b571
Merge: bb04dcd a64a31c
Author: Juergen Spitzmueller <[email protected]>
Date: Mon Jan 9 09:53:20 2017 +0100
Merge branch 'master' into biblatex2
lib/doc/Additional.lyx |13630 +++++++++++++++++++--------------------
lib/doc/es/Math.lyx | 7 -
lib/examples/ca/mathed.lyx | 4 -
lib/examples/de/linguistics.lyx | 14 +-
src/Buffer.cpp | 2 +-
src/insets/InsetExternal.cpp | 3 +-
src/insets/InsetHyperlink.cpp | 3 +-
7 files changed, 6796 insertions(+), 6867 deletions(-)
