]> git.lyx.org Git - features.git/commitdiff
Merge branch '2.1.x' of git.lyx.org:lyx into 2.1.x
authorUwe Stöhr <uwestoehr@lyx.org>
Mon, 28 Apr 2014 20:27:19 +0000 (22:27 +0200)
committerUwe Stöhr <uwestoehr@lyx.org>
Mon, 28 Apr 2014 20:27:19 +0000 (22:27 +0200)
1  2 
status.21x

diff --cc status.21x
Simple merge