cpw.malu.xmpp.google_ft: db59cf51: propagate from branch 'im.pidgin.pidgin'...

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: db59cf5117aeb8671c33f9998231ad16252f0c92
Parent:   665e2d641cdd2b6cca3bca378641f8345572146f
Parent:   ea80a29a5a149750a33e39367ba205e73ff9b06d
Author:   malu at pidgin.im
Date:     09/13/10 14:35:44
Branch:   im.pidgin.cpw.malu.xmpp.google_ft
URL: http://d.pidgin.im/viewmtn/revision/info/db59cf5117aeb8671c33f9998231ad16252f0c92

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head 665e2d641cdd2b6cca3bca378641f8345572146f)
            to branch 'im.pidgin.cpw.malu.xmpp.google_ft' (head ea80a29a5a149750a33e39367ba205e73ff9b06d)

Changes against parent 665e2d641cdd2b6cca3bca378641f8345572146f

  added    libpurple/protocols/jabber/google/google_av.c
  added    libpurple/protocols/jabber/google/google_av.h
  added    libpurple/protocols/jabber/google/google_share.c
  added    libpurple/protocols/jabber/google/google_share.h
  patched  configure.ac
  patched  libpurple/protocols/jabber/Makefile.am
  patched  libpurple/protocols/jabber/Makefile.mingw
  patched  libpurple/protocols/jabber/disco.c
  patched  libpurple/protocols/jabber/google/google_session.c
  patched  libpurple/protocols/jabber/google/google_session.h
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/namespaces.h
  patched  libpurple/protocols/jabber/presence.c

Changes against parent ea80a29a5a149750a33e39367ba205e73ff9b06d

  patched  libpurple/protocols/jabber/disco.c
  patched  libpurple/protocols/jabber/google/google_session.c
  patched  libpurple/protocols/jabber/google/google_session.h
  patched  libpurple/protocols/yahoo/yahoo_filexfer.c
  patched  pidgin/Makefile.am
  patched  pidgin/gtkplugin.c