comparison pidgin/gtksmiley.c @ 24797:6c5e31c961de

merge of '13d63095df75c7a8735de7c5417132784063ef0a' and 'f3fb69ce98271254bd19d94ba644ba5d6ade4023'
author Mark Doliner <mark@kingant.net>
date Thu, 18 Dec 2008 20:27:07 +0000
parents c31be282935d
children fe5179d40a51
comparison
equal deleted inserted replaced
24796:400344647e5e 24797:6c5e31c961de