Mercurial > pidgin
comparison finch/gntconv.h @ 29524:0dcdccb03ea0
merge of '0303e2072e9df6a3ea825f996a260acd80f12da7'
and '67de3fff150c538c01ca66706c29a8f19cbfeff1'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Thu, 04 Mar 2010 09:23:19 +0000 |
parents | 6bf32c9e15a7 |
children | 49a33bd1baf1 |
comparison
equal
deleted
inserted
replaced
29523:962bc012a504 | 29524:0dcdccb03ea0 |
---|