comparison pidgin/pidginstock.h @ 31076:bbf7096ae66c

merge of '598ef461d4de936afef7298e55152cc7ecaa9b70' and 'b4c65c273f2934560d9e643a124b31ac2d2328f2'
author ivan.komarov@soc.pidgin.im
date Wed, 27 Oct 2010 18:26:14 +0000
parents 1cdae196aac8
children
comparison
equal deleted inserted replaced
31074:e7365705f151 31076:bbf7096ae66c