summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@gmx.de>2006-12-10 17:35:20 +0000
committerPatrick Ohly <patrick.ohly@gmx.de>2006-12-10 17:35:20 +0000
commite7cd458d37c23871c70d0dddbe263c955fadfbd7 (patch)
tree102dbf6a16ec0826e1ce71b2c9f4340874522838 /COPYING
parent25a8c1f53f47226f8a66f340043b8baff845a5fc (diff)
copyright transfer to Funambol
git-svn-id: https://zeitsenke.de/svn/SyncEvolution/trunk@297 15ad00c4-1369-45f4-8270-35d70d36bdcd
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING5
1 files changed, 3 insertions, 2 deletions
diff --git a/COPYING b/COPYING
index 6a30cc91..d3cba126 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,7 @@
SyncEvolution - An Evolution data synchronization program using SyncML
Copyright (C) 2005-2006 Patrick Ohly <patrick.ohly@gmx.de>
+ Copyright (C) 2007 Funambol
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2 as
@@ -18,8 +19,8 @@
ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, COPYRIGHTS,
TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS SOFTWARE IS DISCLAIMED.
- In addition, as a special exception, Patrick Ohly <patrick.ohly@gmx.de>
- gives permission to link the code of this program with
+ In addition, as a special exception, Patrick Ohly <patrick.ohly@gmx.de> and
+ Funambol give permission to link the code of this program with
the OpenSSL library (or with modified versions of OpenSSL that use the
same license as OpenSSL), and distribute linked combinations including
the two. You must obey the GNU General Public License in all