comparison pidgin/gtksmiley.c @ 26830:5aabe95773dd

merge of 'ccb564416010a2752aa29c68143c9caf1aae054c' and 'de03b3a75caf701d1d2bd1947e26d244ac9225fd'
author Paul Aurich <paul@darkrain42.org>
date Wed, 29 Apr 2009 02:12:19 +0000
parents 38a5df43d525
children 804141095de5
comparison
equal deleted inserted replaced
26829:7b0231e5c818 26830:5aabe95773dd