Mercurial > pidgin
comparison libpurple/nat-pmp.c @ 29751:2b294edceaed
merge of '229f226a4d7937c46842e33328e05fc827bf3573'
and '56dbb07bba4460522cb38830486f96c1d361d78b'
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Sat, 17 Apr 2010 22:22:21 +0000 |
parents | f1437342cc0e |
children | 9ceccb623544 |
comparison
equal
deleted
inserted
replaced
29744:4aa17d7c4e0a | 29751:2b294edceaed |
---|