Skip to content

Commit

Permalink
update qr.min.js to 1.1.3 from https://github.com/neocotic/qr.js, upd…
Browse files Browse the repository at this point in the history
…ate COPYING

 * fixes #7
  • Loading branch information
nodiscc committed Sep 4, 2014
1 parent 50df2cd commit bbc6e66
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 11 deletions.
22 changes: 20 additions & 2 deletions COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
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/>.
Loading

0 comments on commit bbc6e66

Please sign in to comment.