comparison libpurple/protocols/Makefile.am @ 28121:708fd8138784

merge of '2c2401820569b102feeb7ce574b90abdc6406f99' and '59016466b173fa50996ca16d6324a76c63143b12'
author Marcus Lundblad <ml@update.uu.se>
date Fri, 28 Aug 2009 20:45:57 +0000
parents 7b197bc1d196
children 69aa4660401a
comparison
equal deleted inserted replaced
28120:862467b37ee6 28121:708fd8138784