Mercurial > pidgin.yaz
diff finch/gntui.c @ 29669:23f07a817807
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:52:16 +0000 |
parents | 88796aff14d6 |
children | f5bcb58bdf56 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:52:16 +0000 |
parents | 88796aff14d6 |
children | f5bcb58bdf56 |