Mercurial > pidgin
diff libpurple/xmlnode.h @ 29267:58e1e1463b6e
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Thu, 01 Jan 2009 21:16:19 +0000 |
parents | eb0f36c3a58f |
children | 84c7bb2ca41f 774ef2a2e7f8 efde7e6ed5f2 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Thu, 01 Jan 2009 21:16:19 +0000 |
parents | eb0f36c3a58f |
children | 84c7bb2ca41f 774ef2a2e7f8 efde7e6ed5f2 |