]> git.lyx.org Git - features.git/commit
cmake/merge: fix compile, this split conflicts with the others
authorPeter Kümmel <syntheticpp@gmx.net>
Thu, 13 Dec 2007 21:57:37 +0000 (21:57 +0000)
committerPeter Kümmel <syntheticpp@gmx.net>
Thu, 13 Dec 2007 21:57:37 +0000 (21:57 +0000)
commit78caccb1c595e5c0b5f3bb2626ef9410b02fe1e1
tree2a6a8a08db581d6be1fe53586c5ab7928d54eb30
parent4d3050496523a7c4e83b06df296100182409b3cb
cmake/merge: fix compile, this split conflicts with the others

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22137 a592a061-630c-0410-9148-cb99ea01b6c8
src/FuncRequest.cpp
src/factory.cpp