Mercurial > pidgin
comparison libpurple/protocols/sametime/Makefile.am @ 23560:aade89b06762
merge of '5e33eda76b698c04377f5ad6cdd3ad1ec87d2eff'
and 'e935afc929a5049cfa89072e6e9dd8e3ab0afa54'
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Thu, 17 Jul 2008 05:26:47 +0000 |
parents | 441945083737 |
children | 315151da0dc6 2b62300d2c19 |
comparison
equal
deleted
inserted
replaced
23554:ab70eae012f5 | 23560:aade89b06762 |
---|