From bbc6e66ad47ebc134affd6f6bf1869bb1c73c9ca Mon Sep 17 00:00:00 2001 From: nodiscc Date: Fri, 5 Sep 2014 00:42:39 +0200 Subject: update qr.min.js to 1.1.3 from https://github.com/neocotic/qr.js, update COPYING * fixes https://github.com/shaarli/Shaarli/issues/7 --- COPYING | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'COPYING') diff --git a/COPYING b/COPYING index 0ba11e48..91ef0340 100644 --- a/COPYING +++ b/COPYING @@ -40,7 +40,9 @@ Files: images/logo.png License: zlib/libpng Copyright: (c) 2011-2014 idleman idleman@idleman.fr - +Files: ins/qr.min.js +License: GPLv3 +Copyright: (C) 2014 Alasdair Mercer, http://neocotic.com -------------------------------------------------------- ZLIB/LIBPNG LICENSE @@ -62,4 +64,20 @@ freely, subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. \ No newline at end of file + 3. This notice may not be removed or altered from any source distribution. + +---------------------------------------------------- +GPLv3 LICENSE + +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 . \ No newline at end of file -- cgit v1.2.3