]> git.lyx.org Git - features.git/commit
cmake: fix merge build
authorPeter Kümmel <syntheticpp@gmx.net>
Sat, 7 Nov 2009 12:50:30 +0000 (12:50 +0000)
committerPeter Kümmel <syntheticpp@gmx.net>
Sat, 7 Nov 2009 12:50:30 +0000 (12:50 +0000)
commitdaba8bda2e60e9e3b4c616117c81c5ad5ada941d
tree21083f0de2f0a3f4c8cf0ded591a777d33734569
parent131298543bf8e80fac2c10f5dfad5490f215f4c1
cmake: fix merge build

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31891 a592a061-630c-0410-9148-cb99ea01b6c8
src/BiblioInfo.cpp
src/frontends/qt4/GuiApplication.cpp
src/frontends/qt4/GuiDocument.cpp
src/frontends/qt4/GuiSelectionManager.cpp