diff options
43 files changed, 74 insertions, 80 deletions
@@ -1,11 +1,15 @@ 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 - published by the Free Software Foundation; + Copyright (C) 2005-2006 Patrick Ohly <patrick.ohly@gmx.de> + Copyright (C) 2007 Funambol (up to and including release 0.7, but no + later version) + Copyright (C) 2007-2008 Patrick Ohly <patrick.ohly@gmx.de> + + 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 the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/src/TestMain.cpp b/src/TestMain.cpp index df303767..523ee59a 100644 --- a/src/TestMain.cpp +++ b/src/TestMain.cpp @@ -1,6 +1,5 @@ /* - * Copyright (C) 2005-2006 Patrick Ohly - * Copyright (C) 2007 Funambol + * Copyright (C) 2005-2008 Patrick Ohly * * 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/backends/addressbook/AddressBookConstants.cpp b/src/backends/addressbook/AddressBookConstants.cpp index c83fa856..993d5239 100644 --- a/src/backends/addressbook/AddressBookConstants.cpp +++ b/src/backends/addressbook/AddressBookConstants.cpp @@ -1,6 +1,5 @@ /* - * Copyright (C) 2007 Patrick Ohly - * Copyright (C) 2007 Funambol + * Copyright (C) 2007-2008 Patrick Ohly * * 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/backends/addressbook/AddressBookSource.cpp b/src/backends/addressbook/AddressBookSource.cpp index 596ff397..290e89e0 100644 --- a/src/backends/addressbook/AddressBookSource.cpp +++ b/src/backends/addressbook/AddressBookSource.cpp @@ -1,6 +1,5 @@ /* - * Copyright (C) 2007 Patrick Ohly - * Copyright (C) 2007 Funambol + * Copyright (C) 2007-2008 Patrick Ohly * * 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/backends/addressbook/AddressBookSource.h b/src/backends/addressbook/AddressBookSource.h index 222173e9..ef2d949d 100644 --- a/src/backends/addressbook/AddressBookSource.h +++ b/src/backends/addressbook/AddressBookSource.h @@ -1,6 +1,5 @@ /* - * Copyright (C) 2007 Patrick Ohly - * Copyright (C) 2007 Funambol + * Copyright (C) 2007-2008 Patrick Ohly * * 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/backends/evolution/EvolutionCalendarSource.cpp b/src/backends/evolution/EvolutionCalendarSource.cpp index dd8770c9..8a7b3d5c 100644 --- a/src/backends/evolution/EvolutionCalendarSource.cpp +++ b/src/backends/evolution/EvolutionCalendarSource.cpp @@ -1,6 +1,5 @@ /* - * Copyright (C) 2005-2006 Patrick Ohly - * Copyright (C) 2007 Funambol + * Copyright (C) 2005-2008 Patrick Ohly * * 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/backends/evolution/EvolutionCalendarSource.h b/src/backends/evolution/EvolutionCalendarSource.h index d09d498b..37e27309 100644 --- a/src/backends/evolution/EvolutionCalendarSource.h +++ b/src/backends/evolution/EvolutionCalendarSource.h @@ -1,6 +1,5 @@ /* - * Copyright (C) 2005-2006 Patrick Ohly - * Copyright (C) 2007 Funambol + * Copyright (C) 2005-2008 Patrick Ohly * * 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/backends/evolution/EvolutionContactSource.cpp b/src/backends/evolution/EvolutionContactSource.cpp index d5a52a9b..6d22e69d 100644 --- a/src/backends/evolution/EvolutionContactSource.cpp +++ b/src/backends/evolution/EvolutionContactSource.cpp @@ -1,6 +1,5 @@ /* - * Copyright (C) 2005-2006 Patrick Ohly - * Copyright (C) 2007 Funambol + * Copyright (C) 2005-2008 Patrick Ohly * * 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/backends/evolution/EvolutionContactSource.h b/src/backends/evolution/EvolutionContactSource.h index 331b6b41..9603bb1d 100644 --- a/src/backends/evolution/EvolutionContactSource.h +++ b/src/backends/evolution/EvolutionContactSource.h @@ -1,6 +1,5 @@ /* - * Copyright (C) 2005-2006 Patrick Ohly - * Copyright (C) 2007 Funambol + * Copyright (C) 2005-2008 Patrick Ohly * * 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/backends/evolution/EvolutionMemoSource.cpp b/src/backends/evolution/EvolutionMemoSource.cpp index c0c2952a..f03a9f73 100644 --- a/src/backends/evolution/EvolutionMemoSource.cpp +++ b/src/backends/evolution/EvolutionMemoSource.cpp @@ -1,6 +1,5 @@ /* - * Copyright (C) 2005-2006 Patrick Ohly - * Copyright (C) 2007 Funambol + * Copyright (C) 2005-2008 Patrick Ohly * * 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/backends/evolution/EvolutionMemoSource.h b/src/backends/evolution/EvolutionMemoSource.h index 75475cee..e58f5bdb 100644 --- a/src/backends/evolution/EvolutionMemoSource.h +++ b/src/backends/evolution/EvolutionMemoSource.h @@ -1,6 +1,5 @@ /* - * Copyright (C) 2005-2006 Patrick Ohly - * Copyright (C) 2007 Funambol + * Copyright (C) 2005-2008 Patrick Ohly * * 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/backends/evolution/e-cal-check-timezones.c b/src/backends/evolution/e-cal-check-timezones.c index 02791aba..f8131dfb 100644 --- a/src/backends/evolution/e-cal-check-timezones.c +++ b/src/backends/evolution/e-cal-check-timezones.c @@ -3,9 +3,10 @@ * * Authors: Patrick Ohly <patrick.ohly@gmx.de> * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU Lesser General Public - * License as published by the Free Software Foundation. + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backends/evolution/e-cal-check-timezones.h b/src/backends/evolution/e-cal-check-timezones.h index a19f644b..bd06a9e3 100644 --- a/src/backends/evolution/e-cal-check-timezones.h +++ b/src/backends/evolution/e-cal-check-timezones.h @@ -3,9 +3,10 @@ * * Authors: Patrick Ohly <patrick.ohly@gmx.de> * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU Lesser General Public - * License as published by the Free Software Foundation. + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/backends/file/FileSyncSource.cpp b/src/backends/file/FileSyncSource.cpp index be0e711b..18b15a91 100644 --- a/src/backends/file/FileSyncSource.cpp +++ b/src/backends/file/FileSyncSource.cpp @@ -1,6 +1,5 @@ /* - * Copyright (C) 2007 Patrick Ohly - * Copyright (C) 2007 Funambol + * Copyright (C) 2007-2008 Patrick Ohly * * 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/backends/file/FileSyncSource.h b/src/backends/file/FileSyncSource.h index ec27fa0e..d9670b96 100644 --- a/src/backends/file/FileSyncSource.h +++ b/src/backends/file/FileSyncSource.h @@ -1,6 +1,5 @@ /* - * Copyright (C) 2007 Patrick Ohly - * Copyright (C) 2007 Funambol + * Copyright (C) 2007-2008 Patrick Ohly * * 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/backends/sqlite/SQLiteContactSource.cpp b/src/backends/sqlite/SQLiteContactSource.cpp index 3901086e..17af5d90 100644 --- a/src/backends/sqlite/SQLiteContactSource.cpp +++ b/src/backends/sqlite/SQLiteContactSource.cpp @@ -1,6 +1,5 @@ /* - * Copyright (C) 2007 Patrick Ohly - * Copyright (C) 2007 Funambol + * Copyright (C) 2007-2008 Patrick Ohly * * 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/backends/sqlite/SQLiteContactSource.h b/src/backends/sqlite/SQLiteContactSource.h index 65e9155b..7f147d19 100644 --- a/src/backends/sqlite/SQLiteContactSource.h +++ b/src/backends/sqlite/SQLiteContactSource.h @@ -1,6 +1,5 @@ /* - * Copyright (C) 2007 Patrick Ohly - * Copyright (C) 2007 Funambol + * Copyright (C) 2007-2008 Patrick Ohly * * 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/backends/sqlite/SQLiteUtil.cpp b/src/backends/sqlite/SQLiteUtil.cpp index 5e754cb9..3ca78173 100644 --- a/src/backends/sqlite/SQLiteUtil.cpp +++ b/src/backends/sqlite/SQLiteUtil.cpp @@ -1,6 +1,5 @@ /* - * Copyright (C) 2007 Patrick Ohly - * Copyright (C) 2007 Funambol + * Copyright (C) 2007-2008 Patrick Ohly * * 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/backends/sqlite/SQLiteUtil.h b/src/backends/sqlite/SQLiteUtil.h index 067d946b..a574f323 100644 --- a/src/backends/sqlite/SQLiteUtil.h +++ b/src/backends/sqlite/SQLiteUtil.h @@ -1,6 +1,5 @@ /* - * Copyright (C) 2007 Patrick Ohly - * Copyright (C) 2007 Funambol + * Copyright (C) 2007-2008 Patrick Ohly * * 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 939d48ad..fdbe085f 100644 --- a/src/client-test-app.cpp +++ b/src/client-test-app.cpp @@ -1,6 +1,5 @@ /* - * Copyright (C) 2005-2006 Patrick Ohly - * Copyright (C) 2007 Funambol + * Copyright (C) 2005-2008 Patrick Ohly * * 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/core/ConfigNode.h b/src/core/ConfigNode.h index 53ec93fc..192bdf2e 100644 --- a/src/core/ConfigNode.h +++ b/src/core/ConfigNode.h @@ -3,7 +3,8 @@ * * 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 - * published by the Free Software Foundation. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/core/EvolutionSmartPtr.h b/src/core/EvolutionSmartPtr.h index 33e0c1ee..7c0352d7 100644 --- a/src/core/EvolutionSmartPtr.h +++ b/src/core/EvolutionSmartPtr.h @@ -1,6 +1,5 @@ /* - * Copyright (C) 2005-2006 Patrick Ohly - * Copyright (C) 2007 Funambol + * Copyright (C) 2005-2008 Patrick Ohly * * 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/core/EvolutionSyncClient.cpp b/src/core/EvolutionSyncClient.cpp index c54ec9aa..7022aeec 100644 --- a/src/core/EvolutionSyncClient.cpp +++ b/src/core/EvolutionSyncClient.cpp @@ -1,6 +1,5 @@ /* - * Copyright (C) 2005-2006 Patrick Ohly - * Copyright (C) 2007 Funambol + * Copyright (C) 2005-2008 Patrick Ohly * * 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/core/EvolutionSyncClient.h b/src/core/EvolutionSyncClient.h index 2605a86a..23adce3f 100644 --- a/src/core/EvolutionSyncClient.h +++ b/src/core/EvolutionSyncClient.h @@ -1,6 +1,5 @@ /* - * Copyright (C) 2005-2006 Patrick Ohly - * Copyright (C) 2007 Funambol + * Copyright (C) 2005-2008 Patrick Ohly * * 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/core/EvolutionSyncSource.cpp b/src/core/EvolutionSyncSource.cpp index f6ae57da..4042572f 100644 --- a/src/core/EvolutionSyncSource.cpp +++ b/src/core/EvolutionSyncSource.cpp @@ -1,6 +1,5 @@ /* - * Copyright (C) 2005-2006 Patrick Ohly - * Copyright (C) 2007 Funambol + * Copyright (C) 2005-2008 Patrick Ohly * * 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/core/EvolutionSyncSource.h b/src/core/EvolutionSyncSource.h index a9d1d80f..de364e9f 100644 --- a/src/core/EvolutionSyncSource.h +++ b/src/core/EvolutionSyncSource.h @@ -1,6 +1,5 @@ /* - * Copyright (C) 2005-2006 Patrick Ohly - * Copyright (C) 2007 Funambol + * Copyright (C) 2005-2008 Patrick Ohly * * 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/core/FileConfigNode.cpp b/src/core/FileConfigNode.cpp index 9d6fc0f0..7e789ac6 100644 --- a/src/core/FileConfigNode.cpp +++ b/src/core/FileConfigNode.cpp @@ -3,7 +3,8 @@ * * 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 - * published by the Free Software Foundation. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/core/FileConfigNode.h b/src/core/FileConfigNode.h index 424ff852..7d4fbdca 100644 --- a/src/core/FileConfigNode.h +++ b/src/core/FileConfigNode.h @@ -1,10 +1,10 @@ /* - * Copyright (C) 2003-2007 Funambol, Inc * Copyright (C) 2008 Patrick Ohly * * 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 - * published by the Free Software Foundation. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/core/FileConfigTree.cpp b/src/core/FileConfigTree.cpp index bad24ba7..f27cab3e 100644 --- a/src/core/FileConfigTree.cpp +++ b/src/core/FileConfigTree.cpp @@ -3,7 +3,8 @@ * * 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 - * published by the Free Software Foundation. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/core/FilterConfigNode.cpp b/src/core/FilterConfigNode.cpp index 0425bc09..076a9773 100644 --- a/src/core/FilterConfigNode.cpp +++ b/src/core/FilterConfigNode.cpp @@ -3,7 +3,8 @@ * * 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 - * published by the Free Software Foundation. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/core/FilterConfigNode.h b/src/core/FilterConfigNode.h index 34befda1..5a76f7de 100644 --- a/src/core/FilterConfigNode.h +++ b/src/core/FilterConfigNode.h @@ -1,10 +1,10 @@ /* - * Copyright (C) 2003-2007 Funambol, Inc * Copyright (C) 2008 Patrick Ohly * * 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 - * published by the Free Software Foundation. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/core/PrefixConfigNode.cpp b/src/core/PrefixConfigNode.cpp index 389bd566..b4ac3ff9 100644 --- a/src/core/PrefixConfigNode.cpp +++ b/src/core/PrefixConfigNode.cpp @@ -3,7 +3,8 @@ * * 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 - * published by the Free Software Foundation. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/core/PrefixConfigNode.h b/src/core/PrefixConfigNode.h index 1ed66551..9b9f7363 100644 --- a/src/core/PrefixConfigNode.h +++ b/src/core/PrefixConfigNode.h @@ -1,10 +1,10 @@ /* - * Copyright (C) 2003-2007 Funambol, Inc * Copyright (C) 2008 Patrick Ohly * * 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 - * published by the Free Software Foundation. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/core/SafeConfigNode.cpp b/src/core/SafeConfigNode.cpp index 5fa641e4..481ef849 100644 --- a/src/core/SafeConfigNode.cpp +++ b/src/core/SafeConfigNode.cpp @@ -3,7 +3,8 @@ * * 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 - * published by the Free Software Foundation. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/core/SafeConfigNode.h b/src/core/SafeConfigNode.h index b2d1ee6b..d4dc1673 100644 --- a/src/core/SafeConfigNode.h +++ b/src/core/SafeConfigNode.h @@ -1,10 +1,10 @@ /* - * Copyright (C) 2003-2007 Funambol, Inc * Copyright (C) 2008 Patrick Ohly * * 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 - * published by the Free Software Foundation. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/core/SyncEvolutionCmdline.cpp b/src/core/SyncEvolutionCmdline.cpp index 8c059fe6..05bb8465 100644 --- a/src/core/SyncEvolutionCmdline.cpp +++ b/src/core/SyncEvolutionCmdline.cpp @@ -3,7 +3,8 @@ * * 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 - * published by the Free Software Foundation. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/core/SyncEvolutionCmdline.h b/src/core/SyncEvolutionCmdline.h index 668bad74..df0fc1f1 100644 --- a/src/core/SyncEvolutionCmdline.h +++ b/src/core/SyncEvolutionCmdline.h @@ -3,7 +3,8 @@ * * 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 - * published by the Free Software Foundation. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/core/SyncEvolutionConfig.cpp b/src/core/SyncEvolutionConfig.cpp index aef07729..ca689792 100644 --- a/src/core/SyncEvolutionConfig.cpp +++ b/src/core/SyncEvolutionConfig.cpp @@ -3,7 +3,8 @@ * * 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 - * published by the Free Software Foundation. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/core/SyncEvolutionConfig.h b/src/core/SyncEvolutionConfig.h index 23480f4b..48467751 100644 --- a/src/core/SyncEvolutionConfig.h +++ b/src/core/SyncEvolutionConfig.h @@ -3,7 +3,8 @@ * * 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 - * published by the Free Software Foundation. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/core/SyncEvolutionUtil.cpp b/src/core/SyncEvolutionUtil.cpp index 5d0af381..de4b1699 100644 --- a/src/core/SyncEvolutionUtil.cpp +++ b/src/core/SyncEvolutionUtil.cpp @@ -3,7 +3,8 @@ * * 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 - * published by the Free Software Foundation. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/core/VolatileConfigNode.h b/src/core/VolatileConfigNode.h index 2cb06106..f85b0be9 100644 --- a/src/core/VolatileConfigNode.h +++ b/src/core/VolatileConfigNode.h @@ -1,10 +1,10 @@ /* - * Copyright (C) 2003-2007 Funambol, Inc * Copyright (C) 2008 Patrick Ohly * * 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 - * published by the Free Software Foundation. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/core/VolatileConfigTree.h b/src/core/VolatileConfigTree.h index 72d46aa8..a249ff25 100644 --- a/src/core/VolatileConfigTree.h +++ b/src/core/VolatileConfigTree.h @@ -1,10 +1,10 @@ /* - * Copyright (C) 2003-2007 Funambol, Inc * Copyright (C) 2008 Patrick Ohly * * 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 - * published by the Free Software Foundation. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/src/syncevolution.cpp b/src/syncevolution.cpp index 0c23ade1..def0208d 100644 --- a/src/syncevolution.cpp +++ b/src/syncevolution.cpp @@ -1,6 +1,5 @@ /* - * Copyright (C) 2005-2006 Patrick Ohly - * Copyright (C) 2007 Funambol + * Copyright (C) 2005-2008 Patrick Ohly * * 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 |