Mercurial > pidgin
diff finch/gntrequest.h @ 25209:e3bb0bbfa388
Fix merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | 829d054f4f1a |
children | 02a2e8183b1d |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | 829d054f4f1a |
children | 02a2e8183b1d |