# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1195253970 0
# Node ID 2ae1233bd6b2cb275e2f4d3faf96b7e995ec1ec8
# Parent  a051b177661e7532e77891ce6cd6ced3013828c8# Parent  16772d539387ff6cfea8b0e9d9cdf65a45d5c083
merge of '2af6143b8106e9e17b15eacee5bd408d8b7fc91a'
     and '9d6b27d8f2e6f67edbf460949a3d074185eaa47e'

diff -r 16772d539387 -r 2ae1233bd6b2 ChangeLog
diff -r 16772d539387 -r 2ae1233bd6b2 ChangeLog.API
diff -r 16772d539387 -r 2ae1233bd6b2 pidgin/gtkdialogs.h
diff -r 16772d539387 -r 2ae1233bd6b2 pidgin/gtklog.h
diff -r 16772d539387 -r 2ae1233bd6b2 pidgin/gtkplugin.h
diff -r 16772d539387 -r 2ae1233bd6b2 pidgin/gtkpounce.h