diff libpurple/accountopt.h @ 32113:4b53d875529f

fixed conflicts in previous merge.
author tdrhq@soc.pidgin.im
date Wed, 26 Aug 2009 03:19:30 +0000
parents 7ff461621d77
children 6e27091869eb
line wrap: on
line diff