# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1177633701 0
# Node ID b2044e10915a08ed299115d7311e0f817fe4b429
# Parent  56071eee3c73af75e19e7fd837ba79187bfd8a6c# Parent  1a639d73682a0c716e5beaf26318c6b4a50cac4d
merge of 'ca40214f7a10f0e15d7bd32bed84b177889ca02d'
     and 'dfafb91b749752416047f800169f9c839c909733'

diff -r 1a639d73682a -r b2044e10915a pidgin/pixmaps/pidgin.ico
Binary file pidgin/pixmaps/pidgin.ico has changed
diff -r 1a639d73682a -r b2044e10915a pidgin/win32/nsis/pixmaps/pidgin-install.ico
Binary file pidgin/win32/nsis/pixmaps/pidgin-install.ico has changed