]> git.lyx.org Git - lyx.git/commit
Compile fix: solve the merge conflicts in the correct way ;)
authorVincent van Ravesteijn <vfr@lyx.org>
Mon, 29 Nov 2010 23:47:55 +0000 (23:47 +0000)
committerVincent van Ravesteijn <vfr@lyx.org>
Mon, 29 Nov 2010 23:47:55 +0000 (23:47 +0000)
commit80c1e18bda3da668a11cc3a0d7b41713d21f18c5
tree346b322475d16da2f6fd67d8c98836874ada4455
parentc42a61c5ac5cd8db86d6482ad8b0d42afc8ebdc4
Compile fix: solve the merge conflicts in the correct way ;)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36607 a592a061-630c-0410-9148-cb99ea01b6c8
src/insets/InsetInfo.cpp
src/insets/InsetInfo.h
src/insets/InsetTabular.cpp
src/insets/InsetText.cpp