comparison libpurple/protocols/msn/slpcall.h @ 20148:e86f136e880e

merge of 'abe5c21ff8b83812c256bc2b14a3f887ecc628b8' and 'bf8de57ed4c36f188044ea0684c201d0a1a67169'
author Jeffrey Connelly <jaconnel@calpoly.edu>
date Tue, 18 Sep 2007 01:08:46 +0000
parents 44b4e8bd759b
children 96e78c0fa32b
comparison
equal deleted inserted replaced
20147:51457cf3d27b 20148:e86f136e880e