Mercurial > pidgin
comparison libpurple/nat-pmp.c @ 21352:ca17c133d6c3
merge of '12ad71995f63338f624cb01c1e25710a0307ca31'
and 'f656cfabc030952447ce96cc94dc83bb8b9ea0d6'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 16 Nov 2007 23:03:22 +0000 |
parents | 6bf32c9e15a7 |
children | 35b4f1dc4c8d |
comparison
equal
deleted
inserted
replaced
21351:7b30d02a36aa | 21352:ca17c133d6c3 |
---|