Mercurial > pidgin.yaz
comparison finch/libgnt/gntwindow.c @ 26238:3e788c0db3a6
resolved conflict -- merged im.pidgin.pidgin to im.pidgin.soc.2008.yahoo
| author | Sulabh Mahajan <sulabh@soc.pidgin.im> |
|---|---|
| date | Wed, 12 Nov 2008 10:23:13 +0000 |
| parents | 261fd722db1f |
| children | 253e5d3988ca |
comparison
equal
deleted
inserted
replaced
| 26237:eb21f65728c0 | 26238:3e788c0db3a6 |
|---|