Mercurial > pidgin.yaz
diff pidgin/pidgin.h @ 20723:9f2bc4396160
merge of '15fd625e20fae56881c7c728a6533fd1699c351c'
and '3829f989342d787500e9abe363c89909db102f4b'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 30 Sep 2007 00:37:03 +0000 |
parents | b5e35cce4f85 |
children | 17b840986607 |