summaryrefslogtreecommitdiffstats
path: root/kalarm
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-06-26 10:58:53 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-06-26 10:58:53 -0500
commit013a68316ba187fc5fbd666a2b4564fe94329278 (patch)
tree4ed9d6741f10c74698b496e416e8c4c952870159 /kalarm
parente7e1fde9b7f08f07501db45b95c304c1ab4e5208 (diff)
parent31f49d0b845052c85ab7c47402c4b6cb143130dd (diff)
downloadtdepim-013a68316ba187fc5fbd666a2b4564fe94329278.tar.gz
tdepim-013a68316ba187fc5fbd666a2b4564fe94329278.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdepim
Diffstat (limited to 'kalarm')
-rw-r--r--kalarm/lib/colourcombo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp
index 992556848..4db9f37ad 100644
--- a/kalarm/lib/colourcombo.cpp
+++ b/kalarm/lib/colourcombo.cpp
@@ -26,7 +26,7 @@
#include <klocale.h>
#include <kcolordialog.h>
-#include "preferences.h"
+#include "kalarm/preferences.h"
#include "colourcombo.moc"