Mercurial > pidgin.yaz
comparison libpurple/upnp.c @ 23211:bda7c7c4d4b2
merge of 'c6ab942a565a274680983552ced9a21feb5f24a9'
and 'f7d017b07571640c01e4ebb88a33ceb638a133bb'
author | Will Thompson <will.thompson@collabora.co.uk> |
---|---|
date | Mon, 26 May 2008 20:51:10 +0000 |
parents | c38d72677c8a |
children | de8f2d3e538a |
comparison
equal
deleted
inserted
replaced
23206:1cc810daf355 | 23211:bda7c7c4d4b2 |
---|