comparison pidgin/gtkmedia.h @ 26127:62b41bb71a60

merge of '36ce4dcc4d637d6227ef52b2e9e72f957f0435ff' and 'fc5fe0f88226b374c4d42d65ed90e97a059f4d0f'
author Marcus Lundblad <ml@update.uu.se>
date Tue, 13 Jan 2009 09:00:57 +0000
parents 0829a08038c6
children 6eeb500ce9a2
comparison
equal deleted inserted replaced
26126:b04508e5cc6c 26127:62b41bb71a60