comparison libpurple/protocols/oscar/oscar_data.c @ 24836:d8689a1a5e5f

merge of '2c386633fb7a57f0cb963070eba463721cf3728c' and 'aeb5b7fdefe27d17110fd9fd660c7fe414bca12b'
author John Bailey <rekkanoryo@rekkanoryo.org>
date Fri, 19 Dec 2008 00:12:10 +0000
parents a270bd4b5298
children 986edbefc516
comparison
equal deleted inserted replaced
24834:6c018e104ed1 24836:d8689a1a5e5f