Mercurial > pidgin.yaz
diff pidgin/gtkconvwin.h @ 25332:9895d55d3877
explicit merge of 'a9579fef71ff6820f390a986132d30b079f590a0'
and '1ca0231d066e176a833be6e44e4a933acf14963a'
to branch 'im.pidgin.pidgin.next.minor'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Thu, 27 Nov 2008 06:46:25 +0000 |
| parents | c0ad0943cd6e |
| children | a8a26b4d8458 22b8a92fb5ee |