cpw.qulogic.cairo: a01f8bac: propagate from branch 'im.pidgin.pidgin'...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: a01f8bac85179426f6d26b17532b13546640bec7
Parent:   8fc85ec45252e4e75ffb22c92f34ea8242151b5c
Parent:   e7abe20448d307649f623c608ecd470060b5f40d
Author:   qulogic at pidgin.im
Date:     08/08/10 16:36:10
Branch:   im.pidgin.cpw.qulogic.cairo
URL: http://d.pidgin.im/viewmtn/revision/info/a01f8bac85179426f6d26b17532b13546640bec7

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head e7abe20448d307649f623c608ecd470060b5f40d)
            to branch 'im.pidgin.cpw.qulogic.cairo' (head 8fc85ec45252e4e75ffb22c92f34ea8242151b5c)

Changes against parent 8fc85ec45252e4e75ffb22c92f34ea8242151b5c

  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
  added    share/ca-certs/ValiCert_Class_2_VA.pem
  patched  ChangeLog
  patched  libpurple/debug.h
  patched  libpurple/protocols/jabber/chat.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/message.c
  patched  libpurple/protocols/msn/directconn.h
  patched  libpurple/protocols/msn/msn.c
  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/soap.c
  patched  libpurple/protocols/mxit/actions.c
  patched  libpurple/protocols/mxit/markup.c
  patched  libpurple/protocols/mxit/roster.c
  patched  libpurple/protocols/mxit/roster.h
  patched  libpurple/protocols/yahoo/libymsg.c
  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/win32/nsis/nsis_translations.desktop.in
  patched  pidgin/win32/nsis/pidgin-installer.nsi
  patched  po/ChangeLog
  patched  po/ca.po
  patched  po/ca at valencia.po
  patched  po/cs.po
  patched  po/de.po
  patched  po/es.po
  patched  po/fr.po
  patched  po/he.po
  patched  po/nl.po
  patched  po/nn.po
  patched  po/pa.po
  patched  po/pl.po
  patched  po/ru.po
  patched  po/sl.po
  patched  share/ca-certs/Makefile.am
  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 e7abe20448d307649f623c608ecd470060b5f40d

  patched  pidgin/gtkimhtml.c
  patched  pidgin/gtkwhiteboard.c
  patched  pidgin/plugins/markerline.c