Mercurial > pidgin
comparison libpurple/protocols/qq/file_trans.h @ 30638:bbf7096ae66c
merge of '598ef461d4de936afef7298e55152cc7ecaa9b70'
and 'b4c65c273f2934560d9e643a124b31ac2d2328f2'
author | ivan.komarov@soc.pidgin.im |
---|---|
date | Wed, 27 Oct 2010 18:26:14 +0000 |
parents | 44b4e8bd759b |
children | 4deef745de87 |
comparison
equal
deleted
inserted
replaced
30636:e7365705f151 | 30638:bbf7096ae66c |
---|