Mercurial > pidgin
comparison libpurple/prefs.c @ 29551:80724c326423
merge of '25d4fad7d77b9c892b18504c1bdc49e0ecf41a0f'
and '758002db4911cba4399db3131f17cff39238db06'
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Sun, 07 Mar 2010 19:56:38 +0000 |
parents | 32a707746454 |
children | 351d07aefb09 |
comparison
equal
deleted
inserted
replaced
29550:54975f0cbc37 | 29551:80724c326423 |
---|