Mercurial > pidgin
diff finch/gntrequest.h @ 29267:58e1e1463b6e
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Thu, 01 Jan 2009 21:16:19 +0000 |
parents | 829d054f4f1a |
children | 02a2e8183b1d |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Thu, 01 Jan 2009 21:16:19 +0000 |
parents | 829d054f4f1a |
children | 02a2e8183b1d |