Added Scintilla license file.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@478 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2006-06-24 19:37:43 +00:00
parent 378d614885
commit 96329e53a5
5 changed files with 25 additions and 2 deletions

View File

@ -17,6 +17,8 @@
* src/sci_cb.c, src/highlighting.c: * src/sci_cb.c, src/highlighting.c:
Removed URL highlighting code(useless feature, never was enabled). Removed URL highlighting code(useless feature, never was enabled).
* src/treeviews.c: Set policy settings for the scolledwindow. * src/treeviews.c: Set policy settings for the scolledwindow.
* scintilla/License.txt, scintilla/Makefile.am, doc/Makefile.am:
Added Scintilla license file.
2006-06-23 Nick Treleaven <nick.treleaven@btinternet.com> 2006-06-23 Nick Treleaven <nick.treleaven@btinternet.com>

View File

@ -9,7 +9,7 @@ EXTRA_DIST = \
geany.glade \ geany.glade \
geany.gladep \ geany.gladep \
data/global.tags \ data/global.tags \
data/global.tags \ data/php.tags \
data/latex.tags \ data/latex.tags \
data/filetypes.* data/filetypes.*

View File

@ -52,4 +52,5 @@ install-data-local: geany.txt htmldoc
$(INSTALL_DATA) ../COPYING $(DOCDIR) $(INSTALL_DATA) ../COPYING $(DOCDIR)
$(INSTALL_DATA) ../AUTHORS $(DOCDIR) $(INSTALL_DATA) ../AUTHORS $(DOCDIR)
$(INSTALL_DATA) ../TODO $(DOCDIR) $(INSTALL_DATA) ../TODO $(DOCDIR)
$(INSTALL_DATA) ../scintilla/License.txt $(DOCDIR)/ScintillaLicense.txt

20
scintilla/License.txt Normal file
View File

@ -0,0 +1,20 @@
License for Scintilla and SciTE
Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
All Rights Reserved
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in
supporting documentation.
NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS, IN NO EVENT SHALL NEIL HODGSON BE LIABLE FOR ANY
SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
OR PERFORMANCE OF THIS SOFTWARE.

View File

@ -67,4 +67,4 @@ marshallers: scintilla-marshal.list
glib-genmarshal --prefix scintilla_marshal scintilla-marshal.list --header > scintilla-marshal.h glib-genmarshal --prefix scintilla_marshal scintilla-marshal.list --header > scintilla-marshal.h
glib-genmarshal --prefix scintilla_marshal scintilla-marshal.list --body > scintilla-marshal.c glib-genmarshal --prefix scintilla_marshal scintilla-marshal.list --body > scintilla-marshal.c
EXTRA_DIST=scintilla-marshal.list scintilla-marshal.c scintilla-marshal.h EXTRA_DIST=scintilla-marshal.list scintilla-marshal.c scintilla-marshal.h License.txt