# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1195253101 0
# Node ID 16772d539387ff6cfea8b0e9d9cdf65a45d5c083
# Parent  6c4de0d24eff7e8d79b8835e3703d872a6905c75# Parent  789ed158a50a224f142d270912361daeef031489
merge of '2c0e5c4e8381b58fde7f6ed1f20e1bf8bcf46201'
     and 'ef7ac46f90a801547f7dfc4295927a956f90e869'

diff -r 789ed158a50a -r 16772d539387 pidgin/gtkblist.c
diff -r 789ed158a50a -r 16772d539387 pidgin/gtkconv.c
diff -r 789ed158a50a -r 16772d539387 pidgin/gtkdebug.c
diff -r 789ed158a50a -r 16772d539387 pidgin/gtkdialogs.c
diff -r 789ed158a50a -r 16772d539387 pidgin/gtkdialogs.h
diff -r 789ed158a50a -r 16772d539387 pidgin/gtkimhtmltoolbar.c
diff -r 789ed158a50a -r 16772d539387 pidgin/gtklog.c
diff -r 789ed158a50a -r 16772d539387 pidgin/gtklog.h
diff -r 789ed158a50a -r 16772d539387 pidgin/gtkplugin.c
diff -r 789ed158a50a -r 16772d539387 pidgin/gtkplugin.h
diff -r 789ed158a50a -r 16772d539387 pidgin/gtkpounce.c
diff -r 789ed158a50a -r 16772d539387 pidgin/gtkpounce.h
diff -r 789ed158a50a -r 16772d539387 pidgin/gtkutils.c
diff -r 789ed158a50a -r 16772d539387 pidgin/plugins/perl/common/GtkDialogs.xs
diff -r 789ed158a50a -r 16772d539387 pidgin/plugins/perl/common/GtkLog.xs
diff -r 789ed158a50a -r 16772d539387 pidgin/plugins/perl/common/GtkPlugin.xs
diff -r 789ed158a50a -r 16772d539387 pidgin/plugins/perl/common/GtkPounce.xs