comparison libpurple/protocols/oscar/family_admin.c @ 23844:d2b73439176d

merge of '6b6139039fdaaf6ab1059337085b3b6267bb474e' and '8eea4c055964a321a6a8f0403d8b27dcd8f0d041'
author Mark Doliner <mark@kingant.net>
date Sun, 17 Aug 2008 19:15:03 +0000
parents 9c0ee2491ed1
children 6e1967b0f90b
comparison
equal deleted inserted replaced
23839:5e7a013bb75e 23844:d2b73439176d