diff libpurple/core.h @ 24530:2b705f7b3cbf

merge of 'eb82ee09b8fde4b12b5de352686970ccc82a3db6' and 'f659186b896d5b905b4cf31a38eab4638224ca0f'
author Marcus Lundblad <ml@update.uu.se>
date Tue, 02 Dec 2008 18:48:54 +0000
parents c6b29adc22d1
children 584063555949 1d3274111180
line wrap: on
line diff