commit b9aabe6d891b5347586bdfaeff407552213f94bb
Merge: 425c190 8914dde
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Tue Jan 10 08:20:49 2017 +0100

    Merge branch 'master' into biblatex2

 src/DocIterator.cpp |   11 +++++-
 src/DocIterator.h   |    2 +
 src/Makefile.am     |    2 +
 src/TocBackend.cpp  |  112 +++-----------------------------------------------
 src/TocBackend.h    |   99 ++++++++++----------------------------------
 src/TocBuilder.cpp  |   92 +++++++++++++++++++++++++++++++++++++++++
 src/TocBuilder.h    |   61 ++++++++++++++++++++++++++++
 7 files changed, 197 insertions(+), 182 deletions(-)

Reply via email to