comparison pidgin/gtkimhtmltoolbar.c @ 22277:be419fb6eb20

merge of '4c2c343355f23e33c5b251b3d61f07af3fd8ac8b' and '8bec06d2cd0a64ece46cb3cd73db9b085b91e161'
author Jeffrey Connelly <jaconnel@calpoly.edu>
date Sat, 09 Feb 2008 07:35:21 +0000
parents 35d5b7804449
children 28005860d2c9 02eda4bd2b22 92e71f6e10d4 e9cf897bd873
comparison
equal deleted inserted replaced
22274:4fced932324a 22277:be419fb6eb20