Mercurial > pidgin
comparison libpurple/protocols/jabber/Makefile.am @ 20146:ad691fe92bf8
merge of '581cfaaf2f02af0abbaa8910cedb9f7f62b25a5c'
and '8bb511fc7058716755e1117ddde9b2baa349cbab'
author | Casey Harkins <charkins@pidgin.im> |
---|---|
date | Tue, 18 Sep 2007 01:02:45 +0000 |
parents | b70664a62de8 |
children | 60f5abc6cf0c 4ac5db6e39f3 1cbe5a9f6efb b4ec5481a67a |
comparison
equal
deleted
inserted
replaced
20142:743cb3444b6b | 20146:ad691fe92bf8 |
---|