Mercurial > pidgin
diff Makefile.am @ 27083:8671d9a37002
Fix merge error.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 08 Jun 2009 04:42:33 +0000 |
parents | 4b8c4870b13a |
children | cc8f641d2fde |
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 08 Jun 2009 04:42:33 +0000 |
parents | 4b8c4870b13a |
children | cc8f641d2fde |