diff options
| author | Robert McQueen <robert.mcqueen@collabora.co.uk> | 2006-10-11 21:34:48 +0000 |
|---|---|---|
| committer | Robert McQueen <robert.mcqueen@collabora.co.uk> | 2006-10-11 21:34:48 +0000 |
| commit | cfd5057ccd97b31ea85749ba341720f6f230acbc (patch) | |
| tree | 51a3ce76f39e3392c10ae96cfef11c0f7c8e2c63 | |
| parent | 80456608c0aac79363e7e883804ed5aefe01328e (diff) | |
GabbleConnection: merge conflicts with headers in gabble-connection.c (they're alphabetical, mostly :D)
| -rw-r--r-- | src/gabble-connection.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gabble-connection.c b/src/gabble-connection.c index 5d2ebc678..60939d6c4 100644 --- a/src/gabble-connection.c +++ b/src/gabble-connection.c @@ -45,18 +45,20 @@ #define DEBUG_FLAG GABBLE_DEBUG_CONNECTION +#include "capabilities.h" #include "debug.h" #include "disco.h" #include "gabble-presence-cache.h" #include "gabble-presence.h" -#include "jingle-info.h" #include "gabble-register.h" #include "im-factory.h" +#include "jingle-info.h" #include "media-factory.h" #include "muc-factory.h" #include "namespaces.h" #include "roster.h" #include "util.h" +#include "vcard-manager.h" #include "gabble-media-channel.h" #include "gabble-roomlist-channel.h" |