Revision 49d1ed52eed181ce385858122ed018d2f2aa4246

[seanegan at pidgin.im]

-----------------------------------------------------------------
Revision: 49d1ed52eed181ce385858122ed018d2f2aa4246
Ancestor: 6fed66e65b84d03497aaba03fe7eec5ac5c8c18d
Author: seanegan at pidgin.im
Date: 2007-04-26T19:54:19
Branch: im.pidgin.pidgin

Modified files:
        pidgin/gtkmain.c

ChangeLog: 

fix botched merge

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 49d1ed52eed181ce385858122ed018d2f2aa4246.diff
Type: text/x-diff
Size: 1119 bytes
Desc: not available
Url : http://pidgin.im/pipermail/commits/attachments/20070426/b7ffe6fe/attachment.diff