Mercurial > pidgin
diff libpurple/upnp.h @ 30940:ccaa215ad56b
merge of '235da67d85fa24f86f8a6e0b743c070914f23a45'
and 'eaeb839d23b9ccd56b6f8b0f9e014d57c273f5bf'
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Sun, 21 Nov 2010 10:03:02 +0000 |
parents | 6bf32c9e15a7 |
children | 98520ee78f12 |