Mercurial > pidgin.yaz
diff pidgin/gtkconv.h @ 32508:e21500d61347
merge of '2825cfec5e2f9ce0b43361fdd7bdd21c4ea69b24'
and '4a5d49d94ae44a21c23f7977dd7b6b9f69dfb000'
author | andrew.victor@mxit.com |
---|---|
date | Mon, 05 Sep 2011 18:34:32 +0000 |
parents | 7d33d8c0a082 |
children | 472e70ea58ed |