Mercurial > pidgin
comparison libpurple/status.h @ 29256:f050972561d5
merge of '49798f68cc38cddbf1fb0ef1b458d1adec2f3b12'
and 'f00591c7734e6f35f76c71eabfa9acf81edc3107'
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Thu, 30 Oct 2008 21:00:25 +0000 |
parents | 21f1acb9090f |
children | 9216da5184a2 11cb7f2bb6e8 |
comparison
equal
deleted
inserted
replaced
29255:0caae32d570d | 29256:f050972561d5 |
---|