Mercurial > pidgin
diff doc/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 | 380e7149a777 |
children | 76a689608a83 |
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 08 Jun 2009 04:42:33 +0000 |
parents | 380e7149a777 |
children | 76a689608a83 |