Merge pull request #31 from nodiscc/version-check

[github/shaarli/Shaarli.git] / COPYING

diff --git a/COPYING b/COPYING
index 0ba11e48a75e14c5cb82f2132d1405dba4954cde..91ef03402d66ee06bfc6226f3683ea0e7716fed5 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -40,7 +40,9 @@ Files: images/logo.png
 License: zlib/libpng
 Copyright: (c) 2011-2014 idleman idleman@idleman.fr
 
 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
 
 --------------------------------------------------------
 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.
 
   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 <http://www.gnu.org/licenses/>.
\ No newline at end of file