Mercurial > pidgin
diff libpurple/conversation.c @ 24710:d1d9d085d626
Fix up a bad merge on my part.
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 12 Dec 2008 17:18:59 +0000 |
parents | abf8ebd4c9e1 |
children | 7f552614ec8a 5ebfa814b9e8 22b8a92fb5ee |