diff libpurple/smiley.c @ 24102:23f7321b8291

merge of '7b270e8b949f20550eec69f904e57b5431a83f10' and 'f12c8903079425d7850fa183df0b3f937b2952be'
author Richard Laager <rlaager@wiktel.com>
date Thu, 11 Sep 2008 21:13:13 +0000
parents 90c7142de9d0
children d8452c0bec7b
line wrap: on
line diff