diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
commit | cc29364f06178f8f6b457384f2ec37a042bd9d43 (patch) | |
tree | 7c77a3184c698bbf9d98cef09fb1ba8124daceba /Makefile.am.in | |
parent | 4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff) | |
download | tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip |
* 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
Diffstat (limited to 'Makefile.am.in')
-rw-r--r-- | Makefile.am.in | 2 |
1 files changed, 1 insertions, 1 deletions
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 |