comparison libpurple/nat-pmp.h @ 16640:ee36e4bd84ca

merge of '0612cac578b7e81a69e733d921063a72a039a1d6' and '7d78d68b6f9eca6127d48a613bf7f6a31857f06a'
author William Ehlhardt <williamehlhardt@gmail.com>
date Sun, 29 Apr 2007 07:21:00 +0000
parents 328ae2c041c3
children 533ebd404184
comparison
equal deleted inserted replaced
16629:250623ba4218 16640:ee36e4bd84ca