Mercurial > pidgin.yaz
comparison pidgin/gtknotify.c @ 17120:3034129a10b6
explicit merge of 'bb7e144daba6e060c1f8ed699733a119ea3e107f'
and '37064abba4819599b4b7ad9b9301856633236f2f'
to branch 'im.pidgin.pidgin'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 19 May 2007 07:49:39 +0000 |
| parents | 563a42d98e3a |
| children | 92c3c2eeba87 c1c533448097 |
comparison
equal
deleted
inserted
replaced
| 17119:9fae99335d35 | 17120:3034129a10b6 |
|---|