]> git.lyx.org Git - features.git/commitdiff
Merge branch '2.0.x' of git.lyx.org:lyx into 2.0.x
authorJean-Marc Lasgouttes <lasgouttes@lyx.org>
Mon, 24 Sep 2012 14:01:29 +0000 (16:01 +0200)
committerJean-Marc Lasgouttes <lasgouttes@lyx.org>
Mon, 24 Sep 2012 14:01:29 +0000 (16:01 +0200)
1  2 
src/frontends/qt4/GuiPrefs.cpp

Simple merge