comparison libpurple/protocols/yahoo/yahoo.h @ 19488:ebe2d2e71223

Fixed merge errors stemming from the fact that the main branch and my branch both added something to the prpl struct
author Andreas Monitzer <pidgin@monitzer.com>
date Tue, 28 Aug 2007 07:09:48 +0000
parents ca45543c11a3
children c07a9c6f0263
comparison
equal deleted inserted replaced
19487:c9de28101e6d 19488:ebe2d2e71223