Mercurial > pidgin
comparison libpurple/stun.c @ 26132:edd2cebdead8
Manual merging...
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Mon, 02 Mar 2009 19:47:17 +0000 |
| parents | a6e3cb32cdd2 |
| children | 5d1140b0b10a |
comparison
equal
deleted
inserted
replaced
| 26131:ff4212a5268f | 26132:edd2cebdead8 |
|---|