diff pidgin/pidgin.h @ 20957:1ec2b67e9bc1

merge of '59ab2b78429c94d5d0fc77b1b7892accb524e2a4' and 'e440d3119d6686976d657170c1fce857f4aecfc4'
author Evan Schoenberg <evan.s@dreskin.net>
date Mon, 15 Oct 2007 23:46:12 +0000
parents b5e35cce4f85
children 17b840986607
line wrap: on
line diff