From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001 From: tpearson 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 --- Makefile.am.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.am.in') diff --git a/Makefile.am.in b/Makefile.am.in index 39ffd008..9cea71b0 100644 --- a/Makefile.am.in +++ b/Makefile.am.in @@ -23,7 +23,7 @@ COMPILE_BEFORE_certmanager = libkdenetwork libkpgp COMPILE_BEFORE_korganizer = libkdepim libkpimidentities libkpimexchange kgantt COMPILE_BEFORE_kaddressbook = libkdepim certmanager akregator COMPILE_BEFORE_kandy = libkdepim -COMPILE_BEFORE_kmail= libkdepim libkpimidentities certmanager libkpgp libkmime indexlib +COMPILE_BEFORE_kmail= libkdepim libkpimidentities certmanager libkpgp libkmime COMPILE_BEFORE_knode= libkdepim libkpgp libkmime COMPILE_BEFORE_karm = libkdepim kresources COMPILE_BEFORE_plugins = kmail libkdepim libkcal -- cgit v1.2.3