]> git.lyx.org Git - features.git/commitdiff
Merge branch '2.0.x' of git.lyx.org:lyx into 2.0.x
authorJuergen Spitzmueller <spitz@lyx.org>
Tue, 18 Sep 2012 06:34:05 +0000 (08:34 +0200)
committerJuergen Spitzmueller <spitz@lyx.org>
Tue, 18 Sep 2012 06:34:05 +0000 (08:34 +0200)
1  2 
status.20x

diff --cc status.20x
Simple merge