]> git.lyx.org Git - features.git/commitdiff
merge recent changes from master
authorJuergen Spitzmueller <spitz@lyx.org>
Mon, 9 Jan 2017 19:04:32 +0000 (20:04 +0100)
committerJuergen Spitzmueller <spitz@lyx.org>
Mon, 9 Jan 2017 19:04:32 +0000 (20:04 +0100)
1  2 
lib/doc/Customization.lyx
src/TextClass.cpp
src/frontends/qt4/Menus.cpp
src/insets/InsetCitation.cpp

Simple merge
Simple merge
Simple merge
Simple merge