]> git.lyx.org Git - lyx.git/commit
cmake: fix merge build
authorPeter Kümmel <syntheticpp@gmx.net>
Sat, 6 Mar 2010 16:18:16 +0000 (16:18 +0000)
committerPeter Kümmel <syntheticpp@gmx.net>
Sat, 6 Mar 2010 16:18:16 +0000 (16:18 +0000)
commit870e4549f9aeab8ebe8d3a703dbdfb10c386d9fa
tree62d6987c6b38de3d28658da689333b0d5e6eacc8
parent2d67296c599288c109ae9eec9f960d4841ba3cea
cmake: fix merge build

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33645 a592a061-630c-0410-9148-cb99ea01b6c8
src/Buffer.cpp
src/BufferParams.cpp