diff pidgin/gaimstock.h @ 15689:70e4796455ba

merge of '29edb52ee278b20f6e1569192934bd2f83482536' and 'd25df89939e008ba5819b398d1faa73826345109'
author Evan Schoenberg <evan.s@dreskin.net>
date Fri, 23 Feb 2007 13:50:17 +0000
parents 43eff0c25647
children 1229a0cd9126
line wrap: on
line diff