comparison pidgin/gtkplugin.c @ 19313:f991b8b56d0e

merge of '6d1bdf080fca36b032072edb7ffa550b159b9716' and '71c56cf03e0453c3721fa458eae6d61bb0cfcfa1'
author Luke Schierer <lschiere@pidgin.im>
date Fri, 17 Aug 2007 18:24:18 +0000
parents 08db93bbd798
children 57d350900136 13a779fe3f1e 9d198ce0ab65
comparison
equal deleted inserted replaced
19306:16cad7ba399c 19313:f991b8b56d0e