Mercurial > pidgin
diff libpurple/request.c @ 29275:23f07a817807
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:52:16 +0000 |
parents | f10aba5592c6 |
children | 9bdd3ab8087f 89b95d143116 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:52:16 +0000 |
parents | f10aba5592c6 |
children | 9bdd3ab8087f 89b95d143116 |