fix mismerge
authorColin Leroy <colin@colino.net>
Sat, 3 Jul 2004 11:51:00 +0000 (11:51 +0000)
committerColin Leroy <colin@colino.net>
Sat, 3 Jul 2004 11:51:00 +0000 (11:51 +0000)
commit61b2693737ddd58dd25d2560f5bd18be98916599
tree809ce8a113834377a9b69668fe43ff42517348ad
parentd19c8ed0c7527b165bd95b4231ac6e0b1fe4020d
fix mismerge
ChangeLog-gtk2.claws
configure.ac
src/textview.c