Mercurial > pidgin
comparison libpurple/protocols/qq/file_trans.c @ 25169:a259d2711416
merge of '0da3644551b2442b2db4cf9d828865d167df8072'
and 'efc71f836438eb97ec8d2c8e0874326b6fc64774'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 23 Nov 2008 03:52:40 +0000 |
parents | dbc7a9742f8d |
children | 73a30365c293 33921125348d |
comparison
equal
deleted
inserted
replaced
25148:6adbaf3d25e3 | 25169:a259d2711416 |
---|