Mercurial > pidgin
diff Makefile.am @ 20512:f489d760121f
explicit merge of '3732a7eabc7ecb0f846edc60f04ec3f6f7779c5b'
and '188ab7cc5918fc23174451f818ad99c84715a36e'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sun, 16 Sep 2007 18:02:50 +0000 |
parents | 4c26b23e7859 |
children | f34539eb7a61 |