Mercurial > pidgin
diff pidgin.desktop.in @ 27083:8671d9a37002
Fix merge error.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 08 Jun 2009 04:42:33 +0000 |
parents | ed4ea63c0b45 |
children | 394a6c9b592c 1694eb347a78 |
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 08 Jun 2009 04:42:33 +0000 |
parents | ed4ea63c0b45 |
children | 394a6c9b592c 1694eb347a78 |