diff pidgin/pixmaps/emotes/Makefile.am @ 19136:6b85cbfc80b7

merge of '6a14f373f6f5ea48a0816197f7cfbfdc7600e74e' and 'dfaaf8344b932efe96fe2abe4b0608a02634b2cd'
author Eric Polino <aluink@pidgin.im>
date Thu, 05 Jul 2007 18:21:41 +0000
parents 1ec72a759b5c
children
line wrap: on
line diff