# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1195254012 0
# Node ID b00c94436918cbed4c574a6f123d397299f07fc6
# Parent  0ecc58c20d8b7b37a83bde7d02281d7d0cf38ace# Parent  998cf5d0b401cf4f9a9a25601ca3d84fc1b65596
merge of 'b2a396d17dcaf8a381d711f406c759863a99557c'
     and 'e74d2965b33e0b66fc8795aedef2ed48e1d0bc39'

diff -r 0ecc58c20d8b -r b00c94436918 libpurple/request.h
diff -r 0ecc58c20d8b -r b00c94436918 pidgin/gtkdialogs.h
diff -r 0ecc58c20d8b -r b00c94436918 pidgin/gtklog.h
diff -r 0ecc58c20d8b -r b00c94436918 pidgin/gtkplugin.h
diff -r 0ecc58c20d8b -r b00c94436918 pidgin/gtkpounce.h