Merge branch 'master' into ksni 130
authorAurelien Gateau <agateau@kde.org>
Wed, 3 Mar 2010 17:01:46 +0000 (18:01 +0100)
committerAurelien Gateau <agateau@kde.org>
Wed, 3 Mar 2010 17:01:46 +0000 (18:01 +0100)
commitd2f11135f1159a27967c71a80833e8c779c3e4c1
treecc51f5f27b9e44ae29bb6b398eac573534a31e50
parent6e9e96449e34659c1715cd4ed86d082176b8ca31
parente9c6052032b2016f17095aa1091018db80e1319d
Merge branch 'master' into ksni
src/App.cpp
src/CMakeLists.txt
src/TrayIcon.cpp