| commit | 7db0845a7cac53ceae078ed7c5351620827d634c | |
| author | rjarosz <rjarosz@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | |
| Sun, 17 Dec 2006 17:42:55 +0000 (17 17:42 +0000) | ||
| committer | rjarosz <rjarosz@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | |
| Sun, 17 Dec 2006 17:42:55 +0000 (17 17:42 +0000) | ||
| tree | 3364f636b7bea376fcd67bc39377bcf53df0a3bb | treesnapshot (tar.gz zip) |
| parent | 2c5fb7a72ec96e73e5cb2deeee11746015ecaded | commitdiff |
Merge OSCAR from 3.5 branch up to revision 614413.
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdenetwork@614414 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdenetwork@614414 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| kopete/protocols/oscar/aim/aimaccount.cpp | diffblobblamehistory | |
| kopete/protocols/oscar/aimcontactbase.cpp | diffblobblamehistory |