]> git.lyx.org Git - features.git/commit
fix merge build src/frontends/qt4/QDocument.cpp
authorPeter Kümmel <syntheticpp@gmx.net>
Fri, 25 May 2007 15:05:46 +0000 (15:05 +0000)
committerPeter Kümmel <syntheticpp@gmx.net>
Fri, 25 May 2007 15:05:46 +0000 (15:05 +0000)
commitaf6a9552ed2cb30cc4d66b44927ebffbd17aee88
treeb03e45354c7c953a61b28d2a17e8775c45e9a236
parent5b731aa6a5735946bac3b7951d2a076a4a9cd2b6
fix merge build src/frontends/qt4/QDocument.cpp

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18509 a592a061-630c-0410-9148-cb99ea01b6c8
src/frontends/qt4/QDocument.cpp
src/frontends/qt4/QListings.cpp