Permalink
Browse files

update NOTICE and LICENSE

Signed-off-by: Jean Privat <jean@pryen.org>
  • Loading branch information...
1 parent 1d30afb commit 756ccaa3769b921c36a87913ce948233fedde176 @privat privat committed Feb 13, 2012
Showing with 40 additions and 8 deletions.
  1. +6 −0 LICENSE-BSD
  2. +34 −8 NOTICE
View
@@ -0,0 +1,6 @@
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE FREEBSD PROJECT ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
View
@@ -1,12 +1,38 @@
This product includes software developed as part of the Nit Language
project ( http://nitlanguage.org ).
-Nit Language
- Copyright 2004-2011 Jean Privat <jean@pryen.org>
- Copyright 2006-2008 Floréal Morandat <morandat@lirmm.fr>
- Copyright 2008 Etienne M. Gagnon <egagnon@j-meg.com>
- Copyright 2009-2011 Jean-Sebastien Gelinas <calestar@gmail.com>
- Copyright 2009-2011 Alexis Laferrière <alexis.laf@xymus.net>
- Copyright 2009 Julien Chevalier <chevjulien@gmail.com>
- Copyright 2011 Alexandre Terrasa <alexandre@moz-concept.com>
+Files: *
+Copyright: 2004-2012 Jean Privat <jean@pryen.org>
+ 2006-2008 Floréal Morandat <morandat@lirmm.fr>
+ 2009-2011 Jean-Sebastien Gelinas <calestar@gmail.com>
+ 2009-2012 Alexis Laferrière <alexis.laf@xymus.net>
+ 2009 Julien Chevalier <chevjulien@gmail.com>
+ 2011-2012 Alexandre Terrasa <alexandre@moz-concept.com>
+License: Apache 2.0 (see LICENSE)
+Comment: The main license of the work, exept for the following exceptions
+Files: lib/*
+ clib/*
+ share/nitdoc/*
+Copyright: 2004-2012 Jean Privat <jean@pryen.org>
+ 2006-2008 Floréal Morandat <morandat@lirmm.fr>
+ 2009-2011 Jean-Sebastien Gelinas <calestar@gmail.com>
+ 2009-2012 Alexis Laferrière <alexis.laf@xymus.net>
+ 2009 Julien Chevalier <chevjulien@gmail.com>
+ 2011-2012 Alexandre Terrasa <alexandre@moz-concept.com>
+Licence: BSD 2 (see LICENSE-BSD)
+Comment: Use of libraries and resources is basically unrestricted. We hold the copyright
+ on the compiler and the tools but not on the programs made by the users.
+
+Files: share/nitdoc/scripts/jquery-1.7.1.min.js
+Copyright: 2011 John Resig, http://jquery.com/
+Licence: BSD 2 (see LICENSE-BSD)
+
+Files: /misc/gtksourceview/nit.lang
+Copyright: 2009-2012 Alexis Laferrière <alexis.laf@xymus.net>
+ Based on ruby.lang from
+ 2004 Archit Baweja <bighead@users.sourceforge.net>
+ 2005 Michael Witrant <mike@lepton.fr>
+ 2006 Gabriel Bauman <gbauman@gmail.com>
+License: GPL 2.0 (see LICENSE-GPL-2)
+Comment: GPL because the original work is GPL

0 comments on commit 756ccaa

Please sign in to comment.