SF.net SVN: geany: [478] trunk

[eht16 at users.sourceforge.net]

Revision: 478
Author:   eht16
Date:     2006-06-24 12:37:43 -0700 (Sat, 24 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/geany/?rev=478&view=rev

Log Message:
-----------
Added Scintilla license file.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/Makefile.am
    trunk/doc/Makefile.am
    trunk/scintilla/Makefile.am

Added Paths:
-----------
    trunk/scintilla/License.txt
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-06-24 18:46:08 UTC (rev 477)
+++ trunk/ChangeLog	2006-06-24 19:37:43 UTC (rev 478)
@@ -17,6 +17,8 @@
  * src/sci_cb.c, src/highlighting.c:
    Removed URL highlighting code(useless feature, never was enabled).
  * 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 at btinternet.com>

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2006-06-24 18:46:08 UTC (rev 477)
+++ trunk/Makefile.am	2006-06-24 19:37:43 UTC (rev 478)
@@ -9,7 +9,7 @@
 	geany.glade \
 	geany.gladep \
 	data/global.tags \
-	data/global.tags \
+	data/php.tags \
 	data/latex.tags \
 	data/filetypes.*
 

Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am	2006-06-24 18:46:08 UTC (rev 477)
+++ trunk/doc/Makefile.am	2006-06-24 19:37:43 UTC (rev 478)
@@ -52,4 +52,5 @@
 	$(INSTALL_DATA) ../COPYING $(DOCDIR)
 	$(INSTALL_DATA) ../AUTHORS $(DOCDIR)
 	$(INSTALL_DATA) ../TODO $(DOCDIR)
+	$(INSTALL_DATA) ../scintilla/License.txt $(DOCDIR)/ScintillaLicense.txt
 

Added: trunk/scintilla/License.txt
===================================================================
--- trunk/scintilla/License.txt	                        (rev 0)
+++ trunk/scintilla/License.txt	2006-06-24 19:37:43 UTC (rev 478)
@@ -0,0 +1,20 @@
+License for Scintilla and SciTE
+
+Copyright 1998-2003 by Neil Hodgson <neilh at 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. 
\ No newline at end of file

Modified: trunk/scintilla/Makefile.am
===================================================================
--- trunk/scintilla/Makefile.am	2006-06-24 18:46:08 UTC (rev 477)
+++ trunk/scintilla/Makefile.am	2006-06-24 19:37:43 UTC (rev 478)
@@ -67,4 +67,4 @@
 	glib-genmarshal --prefix scintilla_marshal scintilla-marshal.list --header > scintilla-marshal.h
 	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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.