From 0660660e3d1dedd18ce9c8e9d0a81258eb567d8b Mon Sep 17 00:00:00 2001
From: Eliah REBSTOCK <elireb54@outlook.com>
Date: Fri, 20 Jul 2018 18:41:56 +0200
Subject: [PATCH] Update LICENCE
---
LICENSE | 11 ++++++++++-
README.md | 46 +++++++++++++++++++++++++---------------------
2 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/LICENSE b/LICENSE
index b6fdb37..a11aedf 100644
--- a/LICENSE
+++ b/LICENSE
@@ -634,6 +634,15 @@ the "copyright" line and a pointer to where the full notice is found.
diglog
Copyright (C) 2018 Etienne BRATEAU
+ "LOG", the circuit editing and simulation system
+ "DigLOG", the digital simulator for LOG.
+ Copyright (C) 1985, 1990 David Gillespie.
+ Author's address: daveg@synaptics.edu
+
+ "AnaLOG", the analog simulator for LOG, 5.66
+ Copyright (C) 1985, 1990 John Lazzaro.
+ Author's address: lazzaro@cs.berkeley.edu;
+
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 3 of the License, or
@@ -654,7 +663,7 @@ notice like this when it starts in an interactive mode:
diglog Copyright (C) 2018 Etienne BRATEAU
- "LOG", the circuit editing and simulation system, 5.66
+ "LOG", the circuit editing and simulation system
"DigLOG", the digital simulator for LOG.
Copyright (C) 1985, 1990 David Gillespie.
Author's address: daveg@synaptics.edu
diff --git a/README.md b/README.md
index e32a9c1..68324b6 100644
--- a/README.md
+++ b/README.md
@@ -55,24 +55,28 @@ _Not yet implemented_
## License
```
-"DigLOG", the digital simulator for LOG.
-Copyright (C) 1985, 1990 David Gillespie.
-Author's address: daveg@synaptics.edu
-
-"AnaLOG", the analog simulator for LOG, 5.66
-Copyright (C) 1985, 1990 John Lazzaro.
-Author's address: lazzaro@cs.berkeley.edu;
-
-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 (any version).
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-```
+ diglog
+ Copyright (C) 2018 Etienne BRATEAU
+
+ "LOG", the circuit editing and simulation system
+ "DigLOG", the digital simulator for LOG.
+ Copyright (C) 1985, 1990 David Gillespie.
+ Author's address: daveg@synaptics.edu
+
+ "AnaLOG", the analog simulator for LOG, 5.66
+ Copyright (C) 1985, 1990 John Lazzaro.
+ Author's address: lazzaro@cs.berkeley.edu;
+
+ 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 3 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
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+```
\ No newline at end of file
--
GitLab