diff libpurple/prefs.h @ 29670:a0668fbf2483

Manual merge
author Marcus Lundblad <ml@update.uu.se>
date Mon, 02 Mar 2009 21:53:53 +0000
parents bb43dea90623
children 4b8c4870b13a
line wrap: on
line diff