Mercurial > pidgin
diff libpurple/status.h @ 29267:58e1e1463b6e
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Thu, 01 Jan 2009 21:16:19 +0000 |
parents | 21f1acb9090f |
children | 9216da5184a2 11cb7f2bb6e8 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Thu, 01 Jan 2009 21:16:19 +0000 |
parents | 21f1acb9090f |
children | 9216da5184a2 11cb7f2bb6e8 |