]> git.lyx.org Git - features.git/commit
fix small clash between patches
authorJean-Marc Lasgouttes <lasgouttes@lyx.org>
Mon, 17 Dec 2001 15:08:51 +0000 (15:08 +0000)
committerJean-Marc Lasgouttes <lasgouttes@lyx.org>
Mon, 17 Dec 2001 15:08:51 +0000 (15:08 +0000)
commit12d3ca28862982e724d8d542d88e72a7e19ded6c
treecfe1ae3dccb8e442627fd276025d5c48669e1b46
parente8f7285df35dc57e126a4f882fee77b1efd42a50
fix small clash between patches

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3229 a592a061-630c-0410-9148-cb99ea01b6c8
src/insets/ChangeLog
src/insets/insettext.C