Merge OSCAR from 0.12 branch up to revision 567029.
commit36e225a921112eb3b5531abb5d5d381addc00505
authorrjarosz <rjarosz@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Thu, 27 Jul 2006 20:40:00 +0000 (27 20:40 +0000)
committerrjarosz <rjarosz@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Thu, 27 Jul 2006 20:40:00 +0000 (27 20:40 +0000)
tree95a7c3fde93153343f18e8b3cd1e79aa86e4080c
parent54426e75ff1c7df21563687b5bb5a56b131e109f
Merge OSCAR from 0.12 branch up to revision 567029.

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdenetwork@567030 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
kopete/protocols/oscar/liboscar/contactmanager.cpp
kopete/protocols/oscar/liboscar/contactmanager.h
kopete/protocols/oscar/liboscar/oscartypes.h
kopete/protocols/oscar/liboscar/ssimodifytask.cpp
kopete/protocols/oscar/liboscar/ssimodifytask.h