comparison libpurple/smiley.c @ 24975:d03cfec8bf7f

merge of '2a69c36548c533b1a96f40e1ee6af57c06ab1bad' and '6a12860d1ff4413ceb4ee4796d32912e52573269'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Sat, 13 Dec 2008 08:49:16 +0000
parents 90c7142de9d0
children d8452c0bec7b
comparison
equal deleted inserted replaced
24972:25e2ab1fff1d 24975:d03cfec8bf7f