diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-09-11 12:02:09 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-09-11 12:02:09 +0100 |
| commit | 4c720bc262ea35b802606910b63b57f28929bdc6 (patch) | |
| tree | 3b1f466abaa19717f66f71193f0edc804e59abf6 /plugins | |
| parent | 36b4819e116fbbcca22c7c87d72d31353b6802bb (diff) | |
| parent | 5c2184c21b1e8878394834a3b1ef9096a3c51087 (diff) | |
Merge branch 'telepathy-gabble-0.16'
Conflicts:
NEWS
configure.ac
src/conn-addressing.c
src/jingle-info.c
src/media-channel-hold.c
src/message-util.c
src/muc-tube-dbus.c
src/muc-tube-stream.c
src/olpc-activity.c
src/presence-cache.c
src/protocol.c
src/room-config.c
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/gateways.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/gateways.c b/plugins/gateways.c index 8f121128d..eae683518 100644 --- a/plugins/gateways.c +++ b/plugins/gateways.c @@ -17,10 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "gateways.h" - #include "config.h" +#include "gateways.h" + #include <string.h> #include <telepathy-glib/telepathy-glib.h> |