Mercurial > pidgin.yaz
diff pidgin/pixmaps/protocols/22/Makefile.am @ 17319:8a7238fb7905
explicit merge of 'dc4f2ee34039521ae6a198fe7d62f4dca8a84589'
and '9d8bc74c7c13474edcefafedd0af9020b27c9a2f'
author | Jeffrey Connelly <jaconnel@calpoly.edu> |
---|---|
date | Wed, 30 May 2007 02:56:25 +0000 |
parents | f62023eddfc6 e7d59fa4faaf |
children | 9347a942b7cd |
line wrap: on
line diff