diff pidgin/pidginstock.h @ 23944:8522684560fb

merge of '2907a92b5f377c1eb7ea400907a83a8d39b049d4' and '783def45e3e1edf9b2a2d63f416ff9437452cd6c'
author Luke Schierer <lschiere@pidgin.im>
date Fri, 29 Aug 2008 20:45:44 +0000
parents a0ea445b99de
children b948081819a6 e0a596a0a020 f89bdd34c9f1 22b8a92fb5ee
line wrap: on
line diff