comparison libpurple/protocols/Makefile.am @ 29385:acf7f7637669

merge of '147a2b8b067bccc514ecf55f2a4454f6df40e9bb' and '3b462776d19577ac9844ac289becb8e1626d9dd9'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sun, 07 Feb 2010 08:43:26 +0000
parents 69aa4660401a
children 09f469cb19a8
comparison
equal deleted inserted replaced
29384:ad4960c2df28 29385:acf7f7637669