comparison pidgin/gtksmiley.c @ 32158:47c604efed32

propagate from branch 'im.pidgin.pidgin.2.9.0' (head d3dccc0843de29ce8d5c7e2e017028396dc2b46b) to branch 'im.pidgin.pidgin' (head cfa2120bb1d7c408937f3075c018fb10c1e6eefa)
author Ethan Blanton <elb@pidgin.im>
date Fri, 24 Jun 2011 16:44:06 +0000
parents e2c6e4fc3c84
children 904686722499
comparison
equal deleted inserted replaced
32140:6e5d46ea82f9 32158:47c604efed32