Mercurial > pidgin.yaz
comparison libpurple/nat-pmp.h @ 29661:58e1e1463b6e
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Thu, 01 Jan 2009 21:16:19 +0000 |
parents | 6bf32c9e15a7 |
children |
comparison
equal
deleted
inserted
replaced
29660:008f35e7d538 | 29661:58e1e1463b6e |
---|