Revision 688a6ca6a950f09099407fd96f968771f139a43f

[seanegan at pidgin.im]

-----------------------------------------------------------------
Revision: 688a6ca6a950f09099407fd96f968771f139a43f
Ancestor: 1f2acb75f934f19f04262b06c2907dece2731ed2
Ancestor: dbbf066f8ff65aa32942d6b089abef533cbafe89
Author: seanegan at pidgin.im
Date: 2007-06-01T03:20:38
Branch: im.pidgin.pidgin

Modified files:
        pidgin/Makefile.mingw pidgin/gtkimhtmltoolbar.c
        pidgin/pidginstock.c pidgin/pidginstock.h
        pidgin/pixmaps/toolbar/16/Makefile.am

ChangeLog: 

merge of '1f2acb75f934f19f04262b06c2907dece2731ed2'
     and 'dbbf066f8ff65aa32942d6b089abef533cbafe89'


To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 688a6ca6a950f09099407fd96f968771f139a43f