comparison Makefile.am @ 29849:38d5dd9c9a07

merge of 'c4a26372086186405c4635b2fbf448b8d089f863' and 'c9659a3fecdd575434640e531c3eb61f90de6976'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 30 Apr 2010 03:35:28 +0000
parents f7d03842b9c9
children 62f0988c666c
comparison
equal deleted inserted replaced
29848:1f5c86f79eeb 29849:38d5dd9c9a07