From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 1 Sep 2010 00:37:02 +0000
Subject: * Massive set of changes to bring in all fixes and enhancements from
 the Enterprise PIM branch * Ensured that the Trinity changes were applied on
 top of those enhancements, and any redundancy removed * Added journal read
 support to the CalDAV resource * Fixed CalDAV resource to use events URL for
 tasks and journals when separate URL checkbox unchecked

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 libkdepim/htmldiffalgodisplay.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'libkdepim/htmldiffalgodisplay.h')

diff --git a/libkdepim/htmldiffalgodisplay.h b/libkdepim/htmldiffalgodisplay.h
index 23da21f4c..4495e2003 100644
--- a/libkdepim/htmldiffalgodisplay.h
+++ b/libkdepim/htmldiffalgodisplay.h
@@ -22,8 +22,9 @@
 #ifndef KPIM_HTMLDIFFALGODISPLAY_H
 #define KPIM_HTMLDIFFALGODISPLAY_H
 
+#include "diffalgo.h"
+
 #include <ktextbrowser.h>
-#include <libkdepim/diffalgo.h>
 #include <kdepimmacros.h>
 
 namespace KPIM {
-- 
cgit v1.2.1