Mercurial > pidgin
diff finch/gntmedia.c @ 30165:d88c15d3d8fa
merge of '2354bdb318de029dd9fd2b15e2bb66ffe99920a6'
and '5cd4c8d6a9a467480e21ae349de63f7f200ad39b'
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Sat, 05 Jun 2010 04:16:12 +0000 |
parents | 259bbfb423d4 |
children | a8cc50c2279f |