comparison libpurple/nat-pmp.h @ 15789:d94d3d0f1149

merge of '1e5814c18dbd7349240ceeec8f3d25583e42a7bd' and '8fd51b26e00adf83c2b8a53c556b308efa1c6c51'
author Evan Schoenberg <evan.s@dreskin.net>
date Tue, 13 Mar 2007 10:28:03 +0000
parents 552be3958d6a
children 32c366eeeb99
comparison
equal deleted inserted replaced
15786:b25acae693cd 15789:d94d3d0f1149