comparison pidgin/gtkmain.c @ 30292:7b712cf17262

merge of '73eedf837c2384f502418f091300785c19ccfacd' and '80ca41a75331b3ca9b4c2a4efa04d72104f4909e'
author Paul Aurich <paul@darkrain42.org>
date Tue, 04 May 2010 02:22:31 +0000
parents ac49f12cddeb
children f30a02140f74
comparison
equal deleted inserted replaced
30289:ca60dd3812fa 30292:7b712cf17262