comparison libpurple/cmds.h @ 20687:b1a42d258a14

explicit merge of '0b88f009442a340d4269c95605f580a9f444e767' and 'cb13be33ceda2c587fec6fb3a86d8e777ca7194a' to branch 'im.pidgin.pidgin'
author Richard Laager <rlaager@wiktel.com>
date Fri, 28 Sep 2007 17:01:20 +0000
parents baf144ea4f9b
children 7d0ef1e3ac4f
comparison
equal deleted inserted replaced
20686:fd664b4aa4f1 20687:b1a42d258a14