diff pidgin/gtksmiley.c @ 23322:30deb89c5a76

merge of '457a5c2c9d9b1b235deae2d65b24cc542c12d6e4' and '9ec416e2eb1f0572caf75fe80faa283d3b57deac'
author Ka-Hing Cheung <khc@hxbc.us>
date Sun, 08 Jun 2008 21:44:50 +0000
parents bfbd2b038135
children 21e591b55339
line wrap: on
line diff