Mercurial > pidgin
diff libpurple/status.h @ 22926:4fa01df51fec
merge of '657be692e8fe314ef25624dc2b70d25e1cf8085b'
and 'f34420097faff83cee26133ba8bd05198e56db0a'
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Tue, 13 May 2008 18:56:11 +0000 |
parents | 21f1acb9090f |
children | 9216da5184a2 11cb7f2bb6e8 |