Mercurial > pidgin
diff libpurple/protocols/jabber/pep.c @ 25228:6fed1bb3b02e
Fix merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Wed, 17 Dec 2008 18:23:36 +0000 |
parents | 4caae7801f4d |
children | e1f363f8fd6b 5dd25c58b65e 5f9a24d1c25e |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Wed, 17 Dec 2008 18:23:36 +0000 |
parents | 4caae7801f4d |
children | e1f363f8fd6b 5dd25c58b65e 5f9a24d1c25e |