summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--COPYING5
-rw-r--r--src/EvolutionCalendarSource.cpp3
-rw-r--r--src/EvolutionCalendarSource.h3
-rw-r--r--src/EvolutionContactSource.cpp3
-rw-r--r--src/EvolutionContactSource.h3
-rw-r--r--src/EvolutionSmartPtr.h3
-rw-r--r--src/EvolutionSyncClient.cpp3
-rw-r--r--src/EvolutionSyncClient.h3
-rw-r--r--src/EvolutionSyncSource.cpp3
-rw-r--r--src/EvolutionSyncSource.h3
-rw-r--r--src/TestEvolution.cpp3
-rw-r--r--src/TestMain.cpp3
-rw-r--r--src/client-test-app.cpp3
-rw-r--r--src/syncevolution.cpp3
14 files changed, 29 insertions, 15 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
diff --git a/src/EvolutionCalendarSource.cpp b/src/EvolutionCalendarSource.cpp
index 84f5393e..bdf4680a 100644
--- a/src/EvolutionCalendarSource.cpp
+++ b/src/EvolutionCalendarSource.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2005 Patrick Ohly
+ * Copyright (C) 2005-2006 Patrick Ohly
+ * 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 as published by
diff --git a/src/EvolutionCalendarSource.h b/src/EvolutionCalendarSource.h
index 1578b1c6..c4ca6b0c 100644
--- a/src/EvolutionCalendarSource.h
+++ b/src/EvolutionCalendarSource.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2005 Patrick Ohly
+ * Copyright (C) 2005-2006 Patrick Ohly
+ * 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 as published by
diff --git a/src/EvolutionContactSource.cpp b/src/EvolutionContactSource.cpp
index c3b9edbe..7a106e00 100644
--- a/src/EvolutionContactSource.cpp
+++ b/src/EvolutionContactSource.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2005 Patrick Ohly
+ * Copyright (C) 2005-2006 Patrick Ohly
+ * 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 as published by
diff --git a/src/EvolutionContactSource.h b/src/EvolutionContactSource.h
index 15bfdc7c..0f862031 100644
--- a/src/EvolutionContactSource.h
+++ b/src/EvolutionContactSource.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2005 Patrick Ohly
+ * Copyright (C) 2005-2006 Patrick Ohly
+ * 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 as published by
diff --git a/src/EvolutionSmartPtr.h b/src/EvolutionSmartPtr.h
index 44645acf..2ed839cd 100644
--- a/src/EvolutionSmartPtr.h
+++ b/src/EvolutionSmartPtr.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2005 Patrick Ohly
+ * Copyright (C) 2005-2006 Patrick Ohly
+ * 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 as published by
diff --git a/src/EvolutionSyncClient.cpp b/src/EvolutionSyncClient.cpp
index 23f2e81b..b00cf058 100644
--- a/src/EvolutionSyncClient.cpp
+++ b/src/EvolutionSyncClient.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2005 Patrick Ohly
+ * Copyright (C) 2005-2006 Patrick Ohly
+ * 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 as published by
diff --git a/src/EvolutionSyncClient.h b/src/EvolutionSyncClient.h
index 7eb7f7ab..bea9112e 100644
--- a/src/EvolutionSyncClient.h
+++ b/src/EvolutionSyncClient.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2005 Patrick Ohly
+ * Copyright (C) 2005-2006 Patrick Ohly
+ * 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 as published by
diff --git a/src/EvolutionSyncSource.cpp b/src/EvolutionSyncSource.cpp
index 4c38dca3..dc4e3693 100644
--- a/src/EvolutionSyncSource.cpp
+++ b/src/EvolutionSyncSource.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2005 Patrick Ohly
+ * Copyright (C) 2005-2006 Patrick Ohly
+ * 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 as published by
diff --git a/src/EvolutionSyncSource.h b/src/EvolutionSyncSource.h
index 5d4d3ce3..9fbad820 100644
--- a/src/EvolutionSyncSource.h
+++ b/src/EvolutionSyncSource.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2005 Patrick Ohly
+ * Copyright (C) 2005-2006 Patrick Ohly
+ * 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 as published by
diff --git a/src/TestEvolution.cpp b/src/TestEvolution.cpp
index c65d6ed7..4bceb093 100644
--- a/src/TestEvolution.cpp
+++ b/src/TestEvolution.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2005 Patrick Ohly
+ * Copyright (C) 2005-2006 Patrick Ohly
+ * 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 as published by
diff --git a/src/TestMain.cpp b/src/TestMain.cpp
index 534119a5..df303767 100644
--- a/src/TestMain.cpp
+++ b/src/TestMain.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2005 Patrick Ohly
+ * Copyright (C) 2005-2006 Patrick Ohly
+ * 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 as published by
diff --git a/src/client-test-app.cpp b/src/client-test-app.cpp
index 286c8be9..a5db9697 100644
--- a/src/client-test-app.cpp
+++ b/src/client-test-app.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2005 Patrick Ohly
+ * Copyright (C) 2005-2006 Patrick Ohly
+ * 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 as published by
diff --git a/src/syncevolution.cpp b/src/syncevolution.cpp
index a0af14f4..e4004eca 100644
--- a/src/syncevolution.cpp
+++ b/src/syncevolution.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2005 Patrick Ohly
+ * Copyright (C) 2005-2006 Patrick Ohly
+ * 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 as published by