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