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