Mercurial > pidgin.yaz
diff libpurple/conversation.h @ 22744:99cd68788bc0
merge of '4c5110037671f84e3e775214c32692b5b23c11e1'
and 'ce267e26db218ed48b76eb6ba6eda0e40cf170c7'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Mon, 28 Apr 2008 22:04:07 +0000 (2008-04-28) |
parents | 8eb1846b5c40 |
children | 3d7e9eff04d0 |