diff libpurple/mediamanager.h @ 32697:48d35c0c6224

Fix some merging typos.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 23 Dec 2011 08:06:49 +0000
parents 02a2e8183b1d
children 98520ee78f12
line wrap: on
line diff