Mercurial > pidgin
changeset 28785:a16b0cf55f96
merge of 'a74fb0eb2e8074bf51ffad1750e6eeaf2b28c645'
and 'ccf98af3ddcc098e9248e09d20f3d0801f3ff47d'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Fri, 11 Dec 2009 03:07:52 +0000 |
| parents | 5e4fc3ab19dc (diff) ebba905f1971 (current diff) |
| children | ef43e6df5fdc |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jingle/jingle.c Thu Dec 10 22:10:01 2009 +0000 +++ b/libpurple/protocols/jabber/jingle/jingle.c Fri Dec 11 03:07:52 2009 +0000 @@ -29,12 +29,13 @@ #include "content.h" #include "debug.h" #include "jingle.h" -#include <string.h> #include "session.h" #include "iceudp.h" #include "rawudp.h" #include "rtp.h" +#include <string.h> + GType jingle_get_type(const gchar *type) {