comparison pidgin/gtkconv.h @ 29616:05d2ceedcc74

merge of '6746d602d91ae610baffb8629463407a20b7b2fd' and 'acac0b2e548e3d512ca885de0480a38f0c5c4eae'
author Daniel Atallah <daniel.atallah@gmail.com>
date Sat, 31 Oct 2009 19:28:45 +0000
parents d78f1d400d2f
children 4135044c6497 fe75cd926073
comparison
equal deleted inserted replaced
29615:62e4159afc84 29616:05d2ceedcc74