Mercurial > pidgin.yaz
comparison libpurple/protocols/oscar/oscar.h @ 23844:d2b73439176d
merge of '6b6139039fdaaf6ab1059337085b3b6267bb474e'
and '8eea4c055964a321a6a8f0403d8b27dcd8f0d041'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 17 Aug 2008 19:15:03 +0000 |
parents | 5e7a013bb75e |
children | 531922f4ea2a e187fdccd743 365b90fa23cf |
comparison
equal
deleted
inserted
replaced
23839:5e7a013bb75e | 23844:d2b73439176d |
---|