comparison libpurple/prefs.h @ 20413:fd7b501cc9c8

fix up broken merge
author Ka-Hing Cheung <khc@hxbc.us>
date Sat, 12 May 2007 19:35:18 +0000
parents 32c366eeeb99
children 69e0551deebe 8af9ebae439c 0e30dfac1f46
comparison
equal deleted inserted replaced
20412:522f618a44b4 20413:fd7b501cc9c8