diff --git a/COPYING b/COPYING index ca2639a10..183e7b203 100644 --- a/COPYING +++ b/COPYING @@ -12,8 +12,8 @@ The *spices (generic name for its forks) are heterogeneous in many points due to the work of researchers, electronic designers, software editors, etc. The Ngspice team tries to collect work from the different sources and contribute new functionalities. Thus, the material we manipulate is -heterogeneous in licenses. Keeping the licenses as is, or re-licensing is a -constant debate at ngspice. For release 18, we choose not to relicense. +heterogeneous in licenses. Keeping the licenses as is, is the way to live with +that diversity. For release 21 as well, we choose not to relicense. Copyleft is a fundamental question in FOSS development. The choice of a copylefted contribution, or a non copylefted contribution is an important diff --git a/ChangeLog b/ChangeLog index 0e0e5be4b..cb4edb2af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2010-06-20 Holger Vogt + * COPYING: further update to version 21 + 2010-06-20 Robert Larice * Makefile.am, configure.in, manual/Makefile.am: undo the manual inclusion, see "2010-06-13 Robert Larice"