comparison pidgin/pidgincombobox.c @ 18652:ddb7212a8794

merge of '48f62c11849f8d3ade036cacace03635cf7985ec' and '646137a13a39329e56cf125195eed6f2269ce5f2'
author Ka-Hing Cheung <khc@hxbc.us>
date Fri, 27 Jul 2007 03:47:09 +0000
parents 5b7669d364a1
children 44b4e8bd759b
comparison
equal deleted inserted replaced
18649:8f36a83bc1cf 18652:ddb7212a8794