comparison pidgin/gtkwhiteboard.c @ 29286:bca64f4e4ce5

merge of '7c5666620054a24425f455a96975fbf6174ad8a0' and 'bbcf4976b4db49082dcd52239fe155eb95c4ee1a'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Tue, 19 Jan 2010 06:33:18 +0000
parents f1437342cc0e
children 8594fde2ace3 c4f836780e1c
comparison
equal deleted inserted replaced
29284:337ab97fa198 29286:bca64f4e4ce5