comparison libpurple/smiley.h @ 32411:e4ae42f9da68

merge of 'b11803e108556a29e1204a3ff1fd00a0890d7733' and 'da7bc1419142f97b2def127ef42c9c7c562e77e3'
author andrew.victor@mxit.com
date Wed, 24 Aug 2011 06:45:30 +0000
parents 63cb8c4f3c66
children 02a2e8183b1d
comparison
equal deleted inserted replaced
32402:4fa86d2d1778 32411:e4ae42f9da68