Mercurial > pidgin.yaz
comparison pidgin/gtkmedia.c @ 31027:8ada5c6f305d
merge of '2fa8397877be345efa9c19c1530ad7686236d8e4'
and 'c6b054bb793c9916eb187da12bda64c518f506df'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 10 Oct 2010 05:25:42 +0000 |
parents | b6c3000eec60 |
children | 11211e6427ae |
comparison
equal
deleted
inserted
replaced
31025:485eaf544bb0 | 31027:8ada5c6f305d |
---|