Mercurial > pidgin
diff libpurple/eventloop.h @ 17106:9fae99335d35
explicit merge of 'ef6a11abfc06ebecc3c74e3ab793e47d50125989'
and '170834fdc3a89a6584a59a36ce1f43914acd3a2c'
to branch 'im.pidgin.pidgin'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sat, 19 May 2007 07:47:16 +0000 |
parents | 516f14bef90e |
children | f2d8658b3a86 |