Mercurial > pidgin
changeset 16803:358fade1205e
merge of '2771f100bd7470cecd0f1ff5497c5ba679c43278'
and 'b6a240fadd5059009bb2653a1b7720724f5d9477'
| author | Ka-Hing Cheung <khc@hxbc.us> |
|---|---|
| date | Thu, 03 May 2007 05:30:29 +0000 |
| parents | 4ee8fd6f9202 (current diff) 71f6852c7c41 (diff) |
| children | 9410f6c2c542 |
| files | pidgin/pixmaps/emotes/default/22/theme |
| diffstat | 1 files changed, 19 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/pixmaps/emotes/default/22/theme Thu May 03 04:49:24 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/22/theme Thu May 03 05:30:29 2007 +0000 @@ -64,7 +64,7 @@ msn.png (M) (m) cat.png (@) dog.png (&) -moon.png (S) (s) +moon.png (S) star.png (*) film.png (~) musical-note.png (8) @@ -88,7 +88,7 @@ good.png (Y) (y) bad.png (N) (n) vampire.png :[ :-[ -#goat.png (nah) (NAH) +#goat.png (nah) sun.png (#) rainbow.png (R) (r) quiet.png :-# @@ -97,26 +97,26 @@ sarcastic.png ^o) secret.png :-* sick.png +o( -snail.png (sn) (SN) -turtle.png (tu) (TU) -plate.png (pl) (PL) +snail.png (sn) +turtle.png (tu) +plate.png (pl) bowl.png (||) -pizza.png (pi) (PI) -soccerball.png (so) (SO) -car.png (au) (AU) -airplane.png (ap) (AP) -umbrella.png (um) (UM) -island.png (ip) (IP) -computer.png (co) (CO) -mobile.png (mp) (MP) -brb.png (brb) (BRB) -rain.png (st) (ST) -highfive.png (h5) (H5) -coins.png (mo) (MO) -sheep.png (bah) (BAH) +pizza.png (pi) +soccerball.png (so) +car.png (au) +airplane.png (ap) +umbrella.png (um) +island.png (ip) +computer.png (co) +mobile.png (mp) +brb.png (brb) +rain.png (st) +highfive.png (h5) +coins.png (mo) +sheep.png (bah) dont-know.png :^) thinking.png *-) -thunder.png (li) (LI) +thunder.png (li) party.png <:o) eyeroll.png 8-) yawn.png |-)