commit 7f97ace83b723b5176aaa70518bdec07fb8e4357 Merge: 90e2004 6b21480 Author: Juergen Spitzmueller <sp...@lyx.org> Date: Fri Jan 13 09:11:04 2017 +0100
Merge branch 'master' into biblatex2
lib/CREDITS | 3 +++
lib/generate_contributions.py | 8 ++++++++
src/frontends/qt4/GuiBibtex.cpp | 4 ++++
src/frontends/qt4/ui/BibtexAddUi.ui | 2 +-
4 files changed, 16 insertions(+), 1 deletions(-)
