pidgin.win32.autotools: b3228e26: propagate from branch 'im.pidgin.pidgin'...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: b3228e262b9501b322a0670cba9803d673410cac
Parent:   697d519b07e5425b66babb4d9931aa2f75d979b4
Parent:   d73b1933a947fedcd8b3ecd30b2c373da2d1e63a
Author:   qulogic at pidgin.im
Date:     12/08/10 21:12:34
Branch:   im.pidgin.pidgin.win32.autotools
URL: http://d.pidgin.im/viewmtn/revision/info/b3228e262b9501b322a0670cba9803d673410cac

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head d73b1933a947fedcd8b3ecd30b2c373da2d1e63a)
            to branch 'im.pidgin.pidgin.win32.autotools' (head 697d519b07e5425b66babb4d9931aa2f75d979b4)

Changes against parent 697d519b07e5425b66babb4d9931aa2f75d979b4

  added    pidgin/pixmaps/protocols/16/facebook.png
  added    pidgin/pixmaps/protocols/22/facebook.png
  added    pidgin/pixmaps/protocols/48/facebook.png
  patched  ChangeLog
  patched  ChangeLog.API
  patched  NEWS
  patched  configure.ac
  patched  libpurple/certificate.c
  patched  libpurple/mime.c
  patched  libpurple/network.c
  patched  libpurple/plugins/ssl/ssl-gnutls.c
  patched  libpurple/protocols/gg/lib/dcc7.c
  patched  libpurple/protocols/gg/lib/events.c
  patched  libpurple/protocols/gg/lib/libgadu.c
  patched  libpurple/protocols/gg/lib/libgadu.h
  patched  libpurple/protocols/jabber/jingle/jingle.c
  patched  libpurple/protocols/msn/cmdproc.c
  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/msn/contact.h
  patched  libpurple/protocols/msn/httpconn.c
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/msnutils.c
  patched  libpurple/protocols/msn/msnutils.h
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/p2p.c
  patched  libpurple/protocols/msn/p2p.h
  patched  libpurple/protocols/msn/sbconn.c
  patched  libpurple/protocols/msn/sbconn.h
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/msn/session.h
  patched  libpurple/protocols/msn/slpcall.c
  patched  libpurple/protocols/msn/slplink.c
  patched  libpurple/protocols/msn/slpmsg.c
  patched  libpurple/protocols/msn/slpmsg_part.c
  patched  libpurple/protocols/msn/slpmsg_part.h
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/msn/user.c
  patched  libpurple/protocols/msn/user.h
  patched  libpurple/protocols/msn/xfer.c
  patched  libpurple/protocols/msn/xfer.h
  patched  libpurple/protocols/oscar/family_locate.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/oscarcommon.h
  patched  libpurple/purple-remote
  patched  libpurple/upnp.c
  patched  pidgin/Makefile.mingw
  patched  pidgin/gtkaccount.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkimhtml.c
  patched  pidgin/gtkscrollbook.c
  patched  pidgin/gtkutils.c
  patched  pidgin/gtkwhiteboard.c
  patched  pidgin/pixmaps/Makefile.am
  patched  pidgin/plugins/Makefile.mingw
  patched  pidgin/plugins/markerline.c
  patched  pidgin.spec.in
  attr on  pidgin/pixmaps/protocols/16/facebook.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/protocols/22/facebook.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/protocols/48/facebook.png
      set  mtn:manual_merge
       to  true

Changes against parent d73b1933a947fedcd8b3ecd30b2c373da2d1e63a

  added    pidgin/plugins/win32/Makefile.am
  added    pidgin/plugins/win32/transparency/Makefile.am
  added    pidgin/plugins/win32/winprefs/Makefile.am
  patched  configure.ac
  patched  finch/Makefile.am
  patched  finch/finch.c
  patched  finch/gntsound.c
  patched  finch/libgnt/wms/Makefile.am
  patched  finch/plugins/Makefile.am
  patched  libpurple/Makefile.am
  patched  libpurple/certificate.c
  patched  libpurple/dnsquery.c
  patched  libpurple/example/Makefile.am
  patched  libpurple/example/nullclient.c
  patched  libpurple/plugin.c
  patched  libpurple/plugins/Makefile.am
  patched  libpurple/plugins/perl/Makefile.am
  patched  libpurple/plugins/ssl/Makefile.am
  patched  libpurple/plugins/tcl/Makefile.am
  patched  libpurple/protocols/bonjour/Makefile.am
  patched  libpurple/protocols/gg/Makefile.am
  patched  libpurple/protocols/irc/Makefile.am
  patched  libpurple/protocols/jabber/Makefile.am
  patched  libpurple/protocols/msn/Makefile.am
  patched  libpurple/protocols/mxit/Makefile.am
  patched  libpurple/protocols/myspace/Makefile.am
  patched  libpurple/protocols/novell/Makefile.am
  patched  libpurple/protocols/null/Makefile.am
  patched  libpurple/protocols/oscar/Makefile.am
  patched  libpurple/protocols/qq/Makefile.am
  patched  libpurple/protocols/sametime/Makefile.am
  patched  libpurple/protocols/simple/Makefile.am
  patched  libpurple/protocols/yahoo/Makefile.am
  patched  libpurple/win32/libc_interface.h
  patched  libpurple/win32/libpurplerc.rc.in
  patched  libpurple/win32/win32dep.c
  patched  libpurple/win32/win32dep.h
  patched  pidgin/Makefile.am
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkdnd-hints.c
  patched  pidgin/gtkdocklet-gtk.c
  patched  pidgin/gtkmain.c
  patched  pidgin/gtkprefs.c
  patched  pidgin/gtksound.c
  patched  pidgin/gtkthemes.c
  patched  pidgin/gtkutils.c
  patched  pidgin/pidginstock.c
  patched  pidgin/plugins/Makefile.am
  patched  pidgin/plugins/cap/Makefile.am
  patched  pidgin/plugins/disco/Makefile.am
  patched  pidgin/plugins/disco/gtkdisco.c
  patched  pidgin/plugins/gestures/Makefile.am
  patched  pidgin/plugins/gevolution/Makefile.am
  patched  pidgin/plugins/musicmessaging/Makefile.am
  patched  pidgin/plugins/musicmessaging/musicmessaging.c
  patched  pidgin/plugins/ticker/Makefile.am
  patched  pidgin/plugins/win32/winprefs/gtkappbar.c
  patched  pidgin/win32/MinimizeToTray.c
  patched  pidgin/win32/gtkdocklet-win32.c
  patched  pidgin/win32/gtkwin32dep.h
  patched  pidgin/win32/pidgin_exe_rc.rc.in
  patched  pidgin/win32/winpidgin.c