Mercurial > pidgin
comparison finch/gntnotify.c @ 17645:9a1c7a566d7c
explicit merge of '1c5a391126b5b506a29f0b9e34160d239cb783c6'
and '8dee13b251ac588bb5ba3c9565e3badd0678254f'
author | Jeffrey Connelly <jaconnel@calpoly.edu> |
---|---|
date | Mon, 18 Jun 2007 01:48:35 +0000 |
parents | 46f2f86e08e4 |
children | bac7cec1609d |
comparison
equal
deleted
inserted
replaced
17644:821ae99678d6 | 17645:9a1c7a566d7c |
---|