diff pidgin/gtksmiley.c @ 29616:05d2ceedcc74

merge of '6746d602d91ae610baffb8629463407a20b7b2fd' and 'acac0b2e548e3d512ca885de0480a38f0c5c4eae'
author Daniel Atallah <daniel.atallah@gmail.com>
date Sat, 31 Oct 2009 19:28:45 +0000
parents a6cfb7bf8c88
children b1df98334930
line wrap: on
line diff