Mercurial > pidgin
diff libpurple/connection.h @ 27347:4fd6b50d03b3
merge of '91a5d80aa52d8c1ca101bfaa0dfc3f7a2feb99ec'
and 'ee2ad24a7d051b291259bd2fc8ce8e57f24c0cbb'
author | Etan Reisner <pidgin@unreliablesource.net> |
---|---|
date | Sat, 04 Jul 2009 17:36:07 +0000 |
parents | d8afc4ba7ce6 |
children | 8b17877d3294 |