Mercurial > pidgin.yaz
diff finch/gntblist.c @ 29669:23f07a817807
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:52:16 +0000 |
parents | 0f7a248848ed |
children | 125cac3e24ee 9bdd3ab8087f e0c8f689f60c |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:52:16 +0000 |
parents | 0f7a248848ed |
children | 125cac3e24ee 9bdd3ab8087f e0c8f689f60c |