Mercurial > pidgin
diff Makefile.am @ 18832:140662c8280c
merge of '599ce70692fe573e98628269564b76296451b587'
and 'bbcb8341b26dc1c43b844d99930c771cf6e64246'
author | Will Thompson <will.thompson@collabora.co.uk> |
---|---|
date | Tue, 07 Aug 2007 11:32:56 +0000 |
parents | 9b47e29ba76c |
children | 4c26b23e7859 |