From 365964391747012b07e4fc25ec93eb9300faeb47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20Tr=C3=B6ger?= Date: Sun, 25 Jun 2006 14:43:09 +0000 Subject: [PATCH] Added license notice Scintilla. git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@481 ea778897-0a13-0410-b9d1-a72fbfd435f5 --- ChangeLog | 5 +++++ README | 11 +++++++++++ doc/geany.docbook | 24 +++++++++++++++++++++++- 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 30f24bff..4a8b7c55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-06-25 Enrico Troeger + + * README, doc/geany.docbook: Added license notice Scintilla. + + 2006-06-25 Nick Treleaven * src/notebook.c, src/notebook.h, src/document.c, src/callbacks.c, diff --git a/README b/README index 511ad0f1..c336d811 100644 --- a/README +++ b/README @@ -74,6 +74,17 @@ well tested and there are some features missing: - support for detecting a running instance +License +------- +Geany is distributed under the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2 of the License, or (at your option) any later version. +A copy of this license can be found in the file COPYING included with the source code of this +program. +The included Scintilla library (found in the subdirectory scintilla/) has its own license, which +can be found in the file scintilla/License.txt included with the source code of this +program. + + Ideas, questions, patches and bug reports ----------------------------------------- See http://geany.uvena.de diff --git a/doc/geany.docbook b/doc/geany.docbook index f25894f0..d5aec27f 100644 --- a/doc/geany.docbook +++ b/doc/geany.docbook @@ -90,7 +90,11 @@ &app; is distributed under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. A copy of this license can be found in the file COPYING included with the source code of this - program and in the appendix of this document. + program and in the appendix A of this document. + + + The included Scintilla library (found in the subdirectory scintilla/) has its own + license, which can be found in the appendix(see ). @@ -1392,4 +1396,22 @@ &legal; + + 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. + + +