Mercurial > pidgin
comparison libpurple/protocols/bonjour/bonjour_ft.c @ 30896:5750f2f2cc0d
merge of '837b54a614756c96003b17bffd4864c0e86d651f'
and 'f01c542dc4811778ea9ae719b9b621eff9c6350b'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Tue, 02 Nov 2010 01:57:06 +0000 |
parents | 9c8b28dc6656 |
children | b671728e6ee9 |
comparison
equal
deleted
inserted
replaced
30895:9fc5ba01b321 | 30896:5750f2f2cc0d |
---|