diff libpurple/smiley.c @ 23465:1d97298ccff5

Fix up some merge errors in MSN's notification.c. Darn meld...
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 07 Jun 2008 03:56:23 +0000
parents 90c7142de9d0
children d8452c0bec7b
line wrap: on
line diff