[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv-trivia

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update doc-generator.xsl from telepathy-spec HEAD

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update xep.xsl to r2040

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove tab in check-c-style.sh

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleIMChannel: order includes according to coding style

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update code-gen tools from telepathy-glib 0.7.12

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    More coding style nits re: casts

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    conn-olpc.c: make all casts and pointer types look like (foo *) bar

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    check-c-style.sh: be strict about formatting of casts and pointer types

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    tubes-channel: coding style nits: casts should look like (TpBaseConnection *) priv->conn