diff pidgin/pidgin.h @ 20646:d954e25e21c0

merge of '6cb0c90b1044b61c7a2c1a7d78c55ef4c5af2bfb' and '98100504d118cf6a92ceb2c94d79aefbd149c73b'
author Luke Schierer <lschiere@pidgin.im>
date Thu, 20 Sep 2007 12:02:57 +0000
parents b5e35cce4f85
children 17b840986607
line wrap: on
line diff