comparison pidgin/gtkconn.c @ 22969:e6ec85b3d28f

merge of 'cf7cc1ec422b7506be056f4d614cbb38856f7f8c' and 'd035782e0f60737fdaf52fb65c7c3a58062f384c'
author Etan Reisner <pidgin@unreliablesource.net>
date Fri, 16 May 2008 02:52:40 +0000
parents a85fcc0c0248
children 975efd786eb3
comparison
equal deleted inserted replaced
22968:c0a8dbe36ffe 22969:e6ec85b3d28f