Mercurial > pidgin.yaz
diff libpurple/protocols/oscar/oscar.h @ 30397:7eeb5a9d1d80
merge of '45c13cbd9c56429c7ed3b9a147b1d76692f3968d'
and '55f17462bcdf93474447c4505853b919e1247311'
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Wed, 19 May 2010 03:26:38 +0000 |
parents | 954e6092f503 |
children | 2a19f7385ba5 f18b6eb0ed02 |