Mercurial > pidgin.yaz
comparison libpurple/media.h @ 29454:5c9c4557fec2
merge of '20a2cebedc53676ed04bba9375a4e5a9cd97b6fd'
and 'c0adc68d6e21c013beb36f789a05d94234c3696a'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Tue, 16 Feb 2010 15:16:28 +0000 |
parents | 2b9983e5cb8d |
children | dcd52d2b1b97 |
comparison
equal
deleted
inserted
replaced
29453:89f072f356ef | 29454:5c9c4557fec2 |
---|