diff pidgin/gtkmedia.h @ 31336:e9e41a04513d

merge of '5e579d58062410991f6268b66906fb7434730423' and '7eb555d9d20df94a7bef577253c8effb724ab484'
author ivan.komarov@soc.pidgin.im
date Tue, 02 Nov 2010 20:51:44 +0000
parents 7921a53b94b3
children
line wrap: on
line diff