diff pidgin/gtksmiley.c @ 27061:1c8d7165df6b

merge of '17367f37cdcde61c1f7a9bc2df681c177a65ffbb' and 'ded483522069298e5562139fb48032231da598dc'
author Paul Aurich <paul@darkrain42.org>
date Tue, 26 May 2009 02:46:24 +0000
parents 38a5df43d525
children 804141095de5
line wrap: on
line diff