Revision 6e7086902b8728961c6017b56588d7731dee2f40

[aluink at pidgin.im]

-----------------------------------------------------------------
Revision: 6e7086902b8728961c6017b56588d7731dee2f40
Ancestor: a0514d5ad4f65678c3b2a5dbcaefed297b45053b
Author: aluink at pidgin.im
Date: 2007-07-06T01:08:22
Branch: im.pidgin.soc.2007.finchfeat

Modified files:
        finch/gntsound.c

ChangeLog: 

Fixed a few merge errors

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 6e7086902b8728961c6017b56588d7731dee2f40.diff
Type: text/x-diff
Size: 1148 bytes
Desc: not available
Url : http://pidgin.im/pipermail/commits/attachments/20070705/800d363a/attachment.diff