# HG changeset patch # User Jeffrey Connelly # Date 1187663082 0 # Node ID 6daf47d87f62717d9430a8fd422f84633f2c4bc1 # Parent a4a59477d92f8a0dc1db6aac5831b3b2e4ec9c79 Remove icons to avoid merge conflicts. diff -r a4a59477d92f -r 6daf47d87f62 pidgin/pixmaps/emotes/default/22/bulgy-eyes.png Binary file pidgin/pixmaps/emotes/default/22/bulgy-eyes.png has changed diff -r a4a59477d92f -r 6daf47d87f62 pidgin/pixmaps/emotes/default/22/messed.png Binary file pidgin/pixmaps/emotes/default/22/messed.png has changed diff -r a4a59477d92f -r 6daf47d87f62 pidgin/pixmaps/emotes/default/22/mohawk.png Binary file pidgin/pixmaps/emotes/default/22/mohawk.png has changed diff -r a4a59477d92f -r 6daf47d87f62 pidgin/pixmaps/emotes/default/22/pirate.png Binary file pidgin/pixmaps/emotes/default/22/pirate.png has changed diff -r a4a59477d92f -r 6daf47d87f62 pidgin/pixmaps/emotes/default/22/sidefrown.png Binary file pidgin/pixmaps/emotes/default/22/sidefrown.png has changed diff -r a4a59477d92f -r 6daf47d87f62 pidgin/pixmaps/emotes/default/22/sinister.png Binary file pidgin/pixmaps/emotes/default/22/sinister.png has changed