[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  telepathy-gabble-rename

Changes:

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename gabble-media-stream.h to media-stream.h

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename gabble-media-stream.c to media-stream.c

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename gabble-connection-manager.c to connection-manager.c

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename gabble-connection.c to connection.c

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename gabble-im-channel.c to im-channel.c

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename gabble-im-channel.h to im-channel.h

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename gabble-muc-channel.c to muc-channel.c

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename gabble-media-channel.h to media-channel.h

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename gabble-roomlist-channel.c to roomlist-channel.c

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename gabble-media-session.c to media-session.c

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename gabble-roster-channel.c to roster-channel.c

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename gabble-register.c to register.c

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename gabble-error.c to error.c

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename gabble-roomlist-channel.h to roomlist-channel.h

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename gabble-types.h to types.h

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename gabble-connection-manager.h to connection-manager.h

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename gabble-media-channel.c to media-channel.c

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename test-gabble-presence to test-presence

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    src/Makefile.am: put source file lists in correct order

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    tidy up test includes

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename gabble-error.h to error.h

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    remove gabble- prefix from generated gabble-media-session-enumtypes.*

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename gabble-register.h to register.h

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename gabble-muc-channel.h to muc-channel.h

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename gabble-connection.h to connection.h

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename gabble-roster-channel.h to roster-channel.h

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    rename gabble-media-session.h to media-session.h