Mercurial > pidgin
diff libpurple/sound.h @ 32674:8f2715fc36db
Fix merge problem.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Sat, 08 Oct 2011 21:24:14 +0000 |
parents | 5876584828e8 |
children | 98520ee78f12 |
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Sat, 08 Oct 2011 21:24:14 +0000 |
parents | 5876584828e8 |
children | 98520ee78f12 |