Mercurial > pidgin.yaz
diff libpurple/purple-send @ 27165:8671d9a37002
Fix merge error.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 08 Jun 2009 04:42:33 +0000 |
parents | 942bf314fc8a |
children | cea56d000b16 |
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 08 Jun 2009 04:42:33 +0000 |
parents | 942bf314fc8a |
children | cea56d000b16 |