# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1177630658 0
# Node ID e861ccfedc0dcbbd01f77db83f8e616a64b0b889
# Parent  5deee71dc64f2b0239c2cc4f24425c66dae66c71# Parent  bff667bfb1d10c097836c4b0c1ffffa54c9e54f6
merge of '6fbb4c1c8ba90a2d5933505006f63216f010d5b9'
     and 'c65d07a2cae7269a05604304bc897121643ffa92'

diff -r 5deee71dc64f -r e861ccfedc0d pidgin/pixmaps/pidgin.ico
Binary file pidgin/pixmaps/pidgin.ico has changed
diff -r 5deee71dc64f -r e861ccfedc0d pidgin/win32/nsis/pixmaps/pidgin-header.bmp
Binary file pidgin/win32/nsis/pixmaps/pidgin-header.bmp has changed
diff -r 5deee71dc64f -r e861ccfedc0d pidgin/win32/nsis/pixmaps/pidgin-intro.bmp
Binary file pidgin/win32/nsis/pixmaps/pidgin-intro.bmp has changed