Merge branch 'master' into indicator 39
authorAurelien Gateau <agateau@kde.org>
Wed, 31 Mar 2010 08:37:33 +0000 (10:37 +0200)
committerAurelien Gateau <agateau@kde.org>
Wed, 31 Mar 2010 08:37:33 +0000 (10:37 +0200)
commit699e1d1a71e19e3b5cc2ce429401f9cf782f45eb
treea84fb6fa61c4ebc6427a743f9a8dfc307f5904d4
parent37dbf14399d423e0669c6e75759c0efc4141d697
parent64db631b9a96551bd1c1213de82709e1972c4d09
Merge branch 'master' into indicator
src/CMakeLists.txt
src/config/konversation.kcfg
src/notificationhandler.cpp