cpw.qulogic.msnp16: fcd3ab49: propagate from branch 'im.pidgin.pidgin'...

qulogic at pidgin.im qulogic at pidgin.im
Sat Jul 31 19:51:20 EDT 2010


----------------------------------------------------------------------
Revision: fcd3ab4963faece2e14447025afb7d6061e12e8b
Parent:   49bf2f5880edfe6f07decbf14418f2032ba59ad0
Parent:   5b9ae21a0927d9a160964bfb1cad7a43253fba0d
Author:   qulogic at pidgin.im
Date:     07/31/10 19:42:35
Branch:   im.pidgin.cpw.qulogic.msnp16
URL: http://d.pidgin.im/viewmtn/revision/info/fcd3ab4963faece2e14447025afb7d6061e12e8b

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head 5b9ae21a0927d9a160964bfb1cad7a43253fba0d)
            to branch 'im.pidgin.cpw.qulogic.msnp16' (head 49bf2f5880edfe6f07decbf14418f2032ba59ad0)

Changes against parent 49bf2f5880edfe6f07decbf14418f2032ba59ad0

  added    libpurple/tests/test_jabber_caps.c
  added    pidgin/pixmaps/emotes/default/24/bored.png
  added    pidgin/pixmaps/emotes/default/24/cold.png
  added    pidgin/pixmaps/emotes/default/24/stressed.png
  added    pidgin/pixmaps/emotes/small/16/bored.png
  added    pidgin/pixmaps/emotes/small/16/boy.png
  added    pidgin/pixmaps/emotes/small/16/chilli.png
  added    pidgin/pixmaps/emotes/small/16/cold.png
  added    pidgin/pixmaps/emotes/small/16/drool.png
  added    pidgin/pixmaps/emotes/small/16/excruciating.png
  added    pidgin/pixmaps/emotes/small/16/eyeroll.png
  added    pidgin/pixmaps/emotes/small/16/girl.png
  added    pidgin/pixmaps/emotes/small/16/lamp.png
  added    pidgin/pixmaps/emotes/small/16/lying.png
  added    pidgin/pixmaps/emotes/small/16/mrgreen.png
  added    pidgin/pixmaps/emotes/small/16/pirate.png
  added    pidgin/pixmaps/emotes/small/16/pissed-off.png
  added    pidgin/pixmaps/emotes/small/16/rose.png
  added    pidgin/pixmaps/emotes/small/16/shut-mouth.png
  added    pidgin/pixmaps/emotes/small/16/star.png
  added    pidgin/pixmaps/emotes/small/16/stressed.png
  patched  COPYRIGHT
  patched  ChangeLog
  patched  ChangeLog.API
  patched  ChangeLog.win32
  patched  Makefile.am
  patched  Makefile.mingw
  patched  NEWS
  patched  configure.ac
  patched  doc/finch.1.in
  patched  finch/finch.c
  patched  finch/gntaccount.c
  patched  finch/gntdebug.c
  patched  finch/gntrequest.c
  patched  finch/gntsound.c
  patched  finch/libgnt/configure.ac
  patched  finch/libgnt/gntbox.c
  patched  finch/libgnt/gntcombobox.c
  patched  finch/libgnt/gntentry.c
  patched  finch/libgnt/gnttree.c
  patched  finch/libgnt/gnttree.h
  patched  finch/libgnt/gntutils.c
  patched  libpurple/Makefile.am
  patched  libpurple/account.c
  patched  libpurple/certificate.c
  patched  libpurple/connection.c
  patched  libpurple/media/backend-fs2.c
  patched  libpurple/plugins/Makefile.mingw
  patched  libpurple/plugins/perl/common/Log.xs
  patched  libpurple/protocols/gg/lib/resolver.c
  patched  libpurple/protocols/irc/cmds.c
  patched  libpurple/protocols/jabber/auth_cyrus.c
  patched  libpurple/protocols/jabber/bosh.c
  patched  libpurple/protocols/jabber/caps.c
  patched  libpurple/protocols/jabber/caps.h
  patched  libpurple/protocols/jabber/data.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/jabber.h
  patched  libpurple/protocols/jabber/jutil.c
  patched  libpurple/protocols/jabber/message.c
  patched  libpurple/protocols/jabber/namespaces.h
  patched  libpurple/protocols/jabber/si.c
  patched  libpurple/protocols/jabber/xdata.c
  patched  libpurple/protocols/jabber/xdata.h
  patched  libpurple/protocols/msn/directconn.c
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/notification.h
  patched  libpurple/protocols/msn/object.c
  patched  libpurple/protocols/msn/object.h
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/msn/session.h
  patched  libpurple/protocols/msn/slp.c
  patched  libpurple/protocols/msn/slplink.c
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/msn/user.h
  patched  libpurple/protocols/mxit/actions.c
  patched  libpurple/protocols/mxit/http.c
  patched  libpurple/protocols/mxit/login.c
  patched  libpurple/protocols/mxit/markup.c
  patched  libpurple/protocols/mxit/multimx.c
  patched  libpurple/protocols/mxit/mxit.c
  patched  libpurple/protocols/mxit/mxit.h
  patched  libpurple/protocols/mxit/profile.c
  patched  libpurple/protocols/mxit/profile.h
  patched  libpurple/protocols/mxit/protocol.c
  patched  libpurple/protocols/mxit/protocol.h
  patched  libpurple/protocols/mxit/roster.c
  patched  libpurple/protocols/mxit/roster.h
  patched  libpurple/protocols/oscar/family_icbm.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/util.c
  patched  libpurple/protocols/yahoo/libyahoo.c
  patched  libpurple/protocols/yahoo/libyahoojp.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/yahoo/libymsg.h
  patched  libpurple/protocols/yahoo/util.c
  patched  libpurple/protocols/yahoo/yahoo_filexfer.c
  patched  libpurple/purple-url-handler
  patched  libpurple/tests/Makefile.am
  patched  libpurple/tests/check_libpurple.c
  patched  libpurple/tests/test_jabber_scram.c
  patched  libpurple/tests/test_util.c
  patched  libpurple/tests/tests.h
  patched  libpurple/upnp.c
  patched  libpurple/util.c
  patched  libpurple/xmlnode.c
  patched  libpurple/xmlnode.h
  patched  pidgin/Makefile.mingw
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkimhtml.c
  patched  pidgin/gtkimhtmltoolbar.c
  patched  pidgin/gtkmain.c
  patched  pidgin/gtkmedia.c
  patched  pidgin/gtkprefs.c
  patched  pidgin/gtkutils.h
  patched  pidgin/pixmaps/emotes/default/24/Makefile.am
  patched  pidgin/pixmaps/emotes/default/24/default.theme.in
  patched  pidgin/pixmaps/emotes/small/16/Makefile.am
  patched  pidgin/pixmaps/emotes/small/16/amorous.png
  patched  pidgin/pixmaps/emotes/small/16/embarrassed.png
  patched  pidgin/pixmaps/emotes/small/16/excited.png
  patched  pidgin/pixmaps/emotes/small/16/hungry.png
  patched  pidgin/pixmaps/emotes/small/16/sleeping.png
  patched  pidgin/pixmaps/emotes/small/16/small.theme.in
  patched  pidgin/plugins/Makefile.mingw
  patched  po/ChangeLog
  patched  po/af.po
  patched  po/am.po
  patched  po/ar.po
  patched  po/as.po
  patched  po/az.po
  patched  po/be at latin.po
  patched  po/bg.po
  patched  po/bn.po
  patched  po/bn_IN.po
  patched  po/bs.po
  patched  po/ca.po
  patched  po/ca at valencia.po
  patched  po/cs.po
  patched  po/da.po
  patched  po/de.po
  patched  po/dz.po
  patched  po/el.po
  patched  po/en_AU.po
  patched  po/en_CA.po
  patched  po/en_GB.po
  patched  po/eo.po
  patched  po/es.po
  patched  po/et.po
  patched  po/eu.po
  patched  po/fa.po
  patched  po/fi.po
  patched  po/fr.po
  patched  po/ga.po
  patched  po/gl.po
  patched  po/gu.po
  patched  po/he.po
  patched  po/hi.po
  patched  po/hu.po
  patched  po/hy.po
  patched  po/id.po
  patched  po/it.po
  patched  po/ja.po
  patched  po/ka.po
  patched  po/km.po
  patched  po/kn.po
  patched  po/ko.po
  patched  po/ku.po
  patched  po/lo.po
  patched  po/lt.po
  patched  po/mk.po
  patched  po/ml.po
  patched  po/mn.po
  patched  po/mr.po
  patched  po/ms_MY.po
  patched  po/my_MM.po
  patched  po/nb.po
  patched  po/ne.po
  patched  po/nl.po
  patched  po/nn.po
  patched  po/oc.po
  patched  po/or.po
  patched  po/pa.po
  patched  po/pl.po
  patched  po/ps.po
  patched  po/pt.po
  patched  po/pt_BR.po
  patched  po/ro.po
  patched  po/ru.po
  patched  po/si.po
  patched  po/sk.po
  patched  po/sl.po
  patched  po/sq.po
  patched  po/sr.po
  patched  po/sr at latin.po
  patched  po/sv.po
  patched  po/sw.po
  patched  po/ta.po
  patched  po/te.po
  patched  po/th.po
  patched  po/tr.po
  patched  po/uk.po
  patched  po/ur.po
  patched  po/vi.po
  patched  po/xh.po
  patched  po/zh_CN.po
  patched  po/zh_HK.po
  patched  po/zh_TW.po
  attr on  pidgin/pixmaps/emotes/default/24/bored.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/default/24/cold.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/default/24/stressed.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/bored.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/boy.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/chilli.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/cold.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/drool.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/excruciating.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/eyeroll.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/girl.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/lamp.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/lying.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/mrgreen.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/pirate.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/pissed-off.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/rose.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/shut-mouth.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/star.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/emotes/small/16/stressed.png
      set  mtn:manual_merge
       to  true

Changes against parent 5b9ae21a0927d9a160964bfb1cad7a43253fba0d

  dropped  libpurple/protocols/msn/dialog.c
  dropped  libpurple/protocols/msn/dialog.h
  dropped  libpurple/protocols/msn/sync.c
  dropped  libpurple/protocols/msn/sync.h
  patched  libpurple/protocols/msn/Makefile.am
  patched  libpurple/protocols/msn/cmdproc.c
  patched  libpurple/protocols/msn/cmdproc.h
  patched  libpurple/protocols/msn/command.h
  patched  libpurple/protocols/msn/error.c
  patched  libpurple/protocols/msn/error.h
  patched  libpurple/protocols/msn/msg.c
  patched  libpurple/protocols/msn/msg.h
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/msn.h
  patched  libpurple/protocols/msn/msnutils.c
  patched  libpurple/protocols/msn/msnutils.h
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/notification.h
  patched  libpurple/protocols/msn/oim.c
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/msn/session.h
  patched  libpurple/protocols/msn/slp.c
  patched  libpurple/protocols/msn/slplink.c
  patched  libpurple/protocols/msn/state.c
  patched  libpurple/protocols/msn/state.h
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/msn/table.h
  patched  libpurple/protocols/msn/transaction.c
  patched  libpurple/protocols/msn/transaction.h
  patched  libpurple/protocols/msn/user.c
  patched  libpurple/protocols/msn/user.h
  patched  po/POTFILES.in



More information about the Commits mailing list