* 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

1 files changed, 3 insertions, 2 deletions

diff --git a/korganizer/aboutdata.cpp b/korganizer/aboutdata.cpp
index f372d11fc..b5fb98c31 100644
--- a/korganizer/aboutdata.cpp
+++ b/korganizer/aboutdata.cpp
@@ -34,10 +34,11 @@ AboutData::AboutData()
                 KAboutData::License_GPL,
                 "(c) 1997-1999 Preston Brown\n"
                 "(c) 2000-2004 Cornelius Schumacher\n"
-                "(c) 2004-2005 Reinhold Kainhofer", 0,
+                "(c) 2004-2005 Reinhold Kainhofer\n"
+                "(c) 2009-2010 Timothy Pearson", 0,
                 "http://korganizer.kde.org" )
 {
-  addAuthor("Timothy Pearson",I18N_NOOP("Current Maintainer"),
+  addAuthor("Timothy Pearson",I18N_NOOP("Current Developer/Maintainer"),
             "[email protected]");
   addAuthor("Reinhold Kainhofer",I18N_NOOP("Previous maintainer"),
             "[email protected]");