diff options
author | Marcus Lundblad <malu@pidgin.im> | 2010-08-31 18:28:10 +0000 |
---|---|---|
committer | Marcus Lundblad <malu@pidgin.im> | 2010-08-31 18:28:10 +0000 |
commit | 5fc609e8fed5539079413d29fa6c23167e9cc718 (patch) | |
tree | 09fe88b7b9c8ad75a3980b876ca970adc0d458f3 /pidgin/pixmaps/emotes/small/16/Makefile.am | |
parent | 24f0a2f2edff9c48f57dd3607ad17b709470a1ff (diff) | |
parent | d96df2d0de45a2b4b0dc5e0dfddb2e13b3c8bb44 (diff) | |
download | pidgin-cpw.malu.xmpp.google_refactor.tar.gz |
propagate from branch 'im.pidgin.pidgin' (head f9599fe0199c86262cea569a5dfb4081df23691d)cpw.malu.xmpp.google_refactor
to branch 'im.pidgin.cpw.malu.xmpp.google_refactor' (head 93935229617363d8fdaf50a9a350c93f0987f66c)
Diffstat (limited to 'pidgin/pixmaps/emotes/small/16/Makefile.am')
-rw-r--r-- | pidgin/pixmaps/emotes/small/16/Makefile.am | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/pidgin/pixmaps/emotes/small/16/Makefile.am b/pidgin/pixmaps/emotes/small/16/Makefile.am index 64ce3768db..af06ecce1b 100644 --- a/pidgin/pixmaps/emotes/small/16/Makefile.am +++ b/pidgin/pixmaps/emotes/small/16/Makefile.am @@ -5,7 +5,10 @@ MOODS = \ cinema.png \ disappointed.png \ embarrassed.png \ + grumpy.png \ + hot.png \ internet.png \ + invincible.png \ music.png \ restroom.png \ search.png \ @@ -22,40 +25,57 @@ SMILEYS = \ angel.png \ angry.png \ beer.png \ + bored.png \ + boy.png \ camera.png \ + chilli.png \ cigarette.png \ coffee.png \ confused.png \ console.png \ - cool.png \ + cold.png \ cross.png \ crying.png \ devil.png \ dont-know.png \ + drool.png \ excited.png \ - grin.png \ + excruciating.png \ + eyeroll.png \ + girl.png \ happy.png \ hug-left.png \ hug-right.png \ + hungry.png \ in_love.png \ kiss.png \ + lamp.png \ + lying.png \ meeting.png \ mobile.png \ + mrgreen.png \ musical-note.png \ nerdy.png \ neutral.png \ party.png \ phone.png \ + pirate.png \ + pissed-off.png \ plate.png \ question.png \ + rose.png \ sad.png \ shame.png \ shocked.png \ + shut-mouth.png \ sick.png \ silent.png \ sleeping.png \ sleepy.png \ + star.png \ + stressed.png \ thinking.png \ + thunder.png \ tongue.png \ tv.png \ uhm-yeah.png \ |