Mercurial > pidgin
comparison libpurple/nat-pmp.h @ 21098:7e200a629109
explicit merge of '8f24e3576448fefbc861e06f1e8d5fe17db2e71a'
and '49d0219884ede2c6c571f2df73e29dffa86f54ad'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sun, 14 Oct 2007 02:13:14 +0000 |
parents | 6bf32c9e15a7 |
children | 98520ee78f12 |
comparison
equal
deleted
inserted
replaced
21093:5e46cdf9ef2b | 21098:7e200a629109 |
---|