diff pidgin/gtksound.h @ 32674:8f2715fc36db

Fix merge problem.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 08 Oct 2011 21:24:14 +0000
parents 02a2e8183b1d
children 34f778db624f
line wrap: on
line diff