Mercurial > pidgin
comparison libpurple/nat-pmp.h @ 17635:00688b54407b
merge of '1c539e43c850fc4ad0c9b8eac2ab1130f283898e'
and '56e11dfcc526ca59d17948421419e51772e1628f'
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Fri, 15 Jun 2007 00:23:13 +0000 |
parents | 533ebd404184 |
children | 6bf32c9e15a7 |
comparison
equal
deleted
inserted
replaced
17633:81d42bfe31fa | 17635:00688b54407b |
---|