comparison libpurple/protocols/oscar/family_bart.c @ 25886:a4a17fe80160

explicit merge of 'f7807039eeef499a403d638cbcb94060a1d33eea' and '59d53e7606e3c4bd860b9fd6c786f61acf61476b'
author Richard Laager <rlaager@wiktel.com>
date Fri, 02 Jan 2009 22:17:09 +0000
parents 9c0ee2491ed1
children 6e1967b0f90b
comparison
equal deleted inserted replaced
25885:138c729f8c9a 25886:a4a17fe80160