comparison libpurple/protocols/jabber/Makefile.am @ 25652:a4cba207068f

merge of '1f6758f8bdba42d2eeca66535d11e7de12d9e715' and '7960f1ad9847ca6bd1918ccc6407afbcdc6cfcb8'
author Paul Aurich <paul@darkrain42.org>
date Sun, 08 Feb 2009 07:07:25 +0000
parents 2b62300d2c19
children adf153852bcf 9ab681f23007 5dd25c58b65e 7183d12b96ed
comparison
equal deleted inserted replaced
25651:d7c195489af3 25652:a4cba207068f