comparison pidgin/gtkmedia.c @ 26951:329f5a43b68a

merge of '49bc9af35492c4f9b66f7233c77ec192432a00f0' and '70ee1de1cc79688256a3dd6ac1a519e24c00a12c'
author Paul Aurich <paul@darkrain42.org>
date Mon, 11 May 2009 22:05:00 +0000
parents df9042312063
children 6e3c83e1057c 20798dc089af
comparison
equal deleted inserted replaced
26950:9612a2e8db87 26951:329f5a43b68a