comparison pidgin/minidialog.c @ 29317:61e2537722e0

merge of '6e11e232a469bd7bd1f5c8dadebcfa5809eb1cd1' and 'e200d014d204272dbca9f1f87a8192b0c3e85ef3'
author Marcus Lundblad <ml@update.uu.se>
date Mon, 01 Feb 2010 21:28:33 +0000
parents 1a94a964bddf
children 2dcff225172e
comparison
equal deleted inserted replaced
29314:4f3a9ddfa34e 29317:61e2537722e0