Skip to content

Commit

Permalink
update NOTICE and LICENSE
Browse files Browse the repository at this point in the history
Signed-off-by: Jean Privat <[email protected]>
  • Loading branch information
privat committed Feb 14, 2012
1 parent 1d30afb commit 756ccaa
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 8 deletions.
6 changes: 6 additions & 0 deletions LICENSE-BSD
Original file line number Diff line number Diff line change
@@ -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.

42 changes: 34 additions & 8 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
Copyright 2006-2008 Floréal Morandat <[email protected]>
Copyright 2008 Etienne M. Gagnon <[email protected]>
Copyright 2009-2011 Jean-Sebastien Gelinas <[email protected]>
Copyright 2009-2011 Alexis Laferrière <[email protected]>
Copyright 2009 Julien Chevalier <[email protected]>
Copyright 2011 Alexandre Terrasa <[email protected]>
Files: *
Copyright: 2004-2012 Jean Privat <[email protected]>
2006-2008 Floréal Morandat <[email protected]>
2009-2011 Jean-Sebastien Gelinas <[email protected]>
2009-2012 Alexis Laferrière <[email protected]>
2009 Julien Chevalier <[email protected]>
2011-2012 Alexandre Terrasa <[email protected]>
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 <[email protected]>
2006-2008 Floréal Morandat <[email protected]>
2009-2011 Jean-Sebastien Gelinas <[email protected]>
2009-2012 Alexis Laferrière <[email protected]>
2009 Julien Chevalier <[email protected]>
2011-2012 Alexandre Terrasa <[email protected]>
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 <[email protected]>
Based on ruby.lang from
2004 Archit Baweja <[email protected]>
2005 Michael Witrant <[email protected]>
2006 Gabriel Bauman <[email protected]>
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.