[Telepathy-commits] merge: telepathy-gabble

[Simon McVittie]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Thu, 17 Apr 2008 at 13:29:49 +0100, Merge Monkey wrote:
> Merge to:
> 
>   telepathy-gabble
> 
> From:
> 
>   /home/smcv/public_html/darcs/gabble-smcv-maemo

Damn, I merged the wrong branch... I meant gabble-smcv.

>   Simon McVittie <simon.mcvittie at collabora.co.uk>
>     Turn off tar-ustar in configure.ac - it's not supported by automake 1.8, as used on Maemo
> 
>   Simon McVittie <simon.mcvittie at collabora.co.uk>
>     Merge with upstream
> 
>   Simon McVittie <simon.mcvittie at collabora.co.uk>
>     tar-ustar turns out to be an Automake 1.9 feature, so require Automake 1.9
> 
>   Simon McVittie <simon.mcvittie at collabora.co.uk>
>     Patch from Jussi Laako to turn off whitespace keepalives (on Maemo, libloudmouth has been patched to use TCP_KEEPALIVE)

I've unpulled these changes, which I hadn't intended to merge right now.
Please unpull them if you were unlucky enough to update from darcs in
the last couple of minutes. Apologies for any inconvenience.

    Simon
-----BEGIN PGP SIGNATURE-----

iD8DBQFIB0SCWSc8zVUw7HYRAmYIAJ9YmMXe98iCCmedh36REmSeSwWX9wCg2W3N
Dspl2GR5JjPng22HBpt7Mjg=
=mPNK
-----END PGP SIGNATURE-----