From 1f92b48eaf4a4d4d132ce59f850722574e1d4569 Mon Sep 17 00:00:00 2001 From: clowwindy Date: Sun, 9 Nov 2014 04:34:08 +0800 Subject: [PATCH] update license --- LICENSE.txt | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index bc72404d..7801cdf2 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -84,18 +84,17 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. qrcodejs -------- -https://github.com/davidshimjs/qrcodejs +QRCode for C#4.0 Silverlight is translation of QRCode for JavaScript +https://github.com/jeromeetienne/jquery-qrcode/ -Copyright (c) 2012 davidshimjs +Copyright (c) 2009 Kazuhiko Arase -Permission is hereby granted, free of charge, -to any person obtaining a copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, -including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: +URL: http://www.d-project.com/ -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +Licensed under the MIT license: + http://www.opensource.org/licenses/mit-license.php -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +The word "QR Code" is registered trademark of +DENSO WAVE INCORPORATED + http://www.denso-wave.com/qrcode/faqpatent-e.html