Mercurial > pidgin
diff libpurple/notify.c @ 26156: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 | 8282911d5e17 |
children | 584063555949 |