diff libpurple/prefs.c @ 32574:4b53d875529f

fixed conflicts in previous merge.
author tdrhq@soc.pidgin.im
date Wed, 26 Aug 2009 03:19:30 +0000
parents 32a707746454
children 351d07aefb09
line wrap: on
line diff