Mercurial > pidgin
comparison libpurple/media.h @ 28595:1acb11145fa4
merge of '47697d74271a33e8dfe15fdeef4210b3ca9b762f'
and 'a878de35a8972daab016ed05e7af50043bd856ca'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Tue, 17 Nov 2009 23:05:13 +0000 |
parents | 713987ae3215 |
children | 2b9983e5cb8d c52dbc5503d0 |
comparison
equal
deleted
inserted
replaced
28594:ecca39fe50d7 | 28595:1acb11145fa4 |
---|