Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
16747:496855295bd7 | 17319:8a7238fb7905 |
---|---|
1 SUBDIRS = scalable | 1 SUBDIRS = scalable |
2 | 2 |
3 EXTRA_DIST = aim.png \ | 3 EXTRA_DIST = aim.png \ |
4 bonjour.png \ | 4 bonjour.png \ |
5 gadu-gadu.png \ | 5 gadu-gadu.png \ |
6 google-talk.png \ | |
6 novell.png \ | 7 novell.png \ |
7 icq.png \ | 8 icq.png \ |
8 irc.png \ | 9 irc.png \ |
9 jabber.png \ | 10 jabber.png \ |
10 meanwhile.png \ | 11 meanwhile.png \ |