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
This commit is contained in:
nodiscc 2014-09-05 00:42:39 +02:00
parent 50df2cde74
commit bbc6e66ad4
2 changed files with 25 additions and 11 deletions

20
COPYING
View file

@ -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
@ -63,3 +65,19 @@ freely, subject to the following restrictions:
not be misrepresented as being the original software.
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 <http://www.gnu.org/licenses/>.

14
inc/qr.min.js vendored

File diff suppressed because one or more lines are too long