Mercurial > pidgin.yaz
diff libpurple/prpl.h @ 31699:a3bfd9439d37
merge of '974d79cf8eb22b7138c9a3d7313e89585fd8b443'
and 'a657534f694305a613db4946ca8ea9ab4c8f1c1d'
author | Evan Schoenberg <evan.s@dreskin.net> |
---|---|
date | Mon, 21 Feb 2011 22:56:48 +0000 |
parents | 44f53d3fc54f |
children | 1bd617f2c46a |