comparison libpurple/gaim-compat.h @ 29829:90dbc46a771f

Fixup merge
author Marcus Lundblad <ml@update.uu.se>
date Mon, 22 Mar 2010 22:26:14 +0000
parents f296be2a1039
children 08dcd2d4f0b7
comparison
equal deleted inserted replaced
29828:f14cbb6a28a7 29829:90dbc46a771f