diff --git a/AUTHORS b/AUTHORS index 124c6602..68ec1880 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,5 @@ +This file is licensed under the terms of the expat license, see the file EXPAT. + Developers: Christian Dywan diff --git a/ChangeLog b/ChangeLog index 4dcb4741..4979a3e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +This file is licensed under the terms of the expat license, see the file EXPAT. + v0.0.21: + Update some translations + Show progress in location when statusbar is hidden diff --git a/EXPAT b/EXPAT new file mode 100644 index 00000000..7da1ab30 --- /dev/null +++ b/EXPAT @@ -0,0 +1,18 @@ +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/HACKING b/HACKING index c1fd5339..88342471 100644 --- a/HACKING +++ b/HACKING @@ -1,3 +1,5 @@ +This file is licensed under the terms of the expat license, see the file EXPAT. + It is 4 spaces, no tabs, preferrably at 80 columns per line. The preferred coding style is explained by example. diff --git a/INSTALL b/INSTALL index 96ddec5b..9fe73038 100644 --- a/INSTALL +++ b/INSTALL @@ -1,3 +1,5 @@ +This file is licensed under the terms of the expat license, see the file EXPAT. + +++ Installing Midori +++ Building and installing Midori is straightforward. diff --git a/Makefile.am b/Makefile.am index 9a6151c4..9e2ee96e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +# This file is licensed under the terms of the expat license, see the file EXPAT. + AUTOMAKE_OPTIONS = gnu SUBDIRS = katze midori po icons diff --git a/README b/README index 4a350946..23a69fb7 100644 --- a/README +++ b/README @@ -1,3 +1,5 @@ +This file is licensed under the terms of the expat license, see the file EXPAT. + Midori is a lightweight web browser. * Full integration with GTK+2. diff --git a/TODO b/TODO index af976e1f..58e019ac 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,5 @@ +This file is licensed under the terms of the expat license, see the file EXPAT. + TODO: . Revamp bookmarks UI, including creating of bookmark folders . Use an update timeout in KatzePropertyProxy instead of only focus-out diff --git a/configure.in b/configure.in index fa102248..2638da05 100644 --- a/configure.in +++ b/configure.in @@ -1,3 +1,4 @@ +# This file is licensed under the terms of the expat license, see the file EXPAT. # Register ourselves to autoconf AC_INIT([midori], [0.0.21], [http://www.twotoasts.de/bugs]) AC_CONFIG_SRCDIR([midori/midori-stock.h]) diff --git a/docs/api/wscript_build b/docs/api/wscript_build index 7cba870e..7733da71 100644 --- a/docs/api/wscript_build +++ b/docs/api/wscript_build @@ -1,5 +1,6 @@ #! /usr/bin/env python # WAF build script for midori +# This file is licensed under the terms of the expat license, see the file EXPAT. import pproc as subprocess diff --git a/docs/user/midori.css b/docs/user/midori.css index 57048efe..eb96e13e 100644 --- a/docs/user/midori.css +++ b/docs/user/midori.css @@ -1,7 +1,7 @@ /* :Author: Christian Dywan :Contact: christian@twotoasts.de -:Copyright: This stylesheet has been placed in the public domain. +:Copyright: This file is licensed under the terms of the expat license, see the file EXPAT. Stylesheet for Midori's documentation based on a version of Enrico Troeger. */ diff --git a/icons/Makefile.am b/icons/Makefile.am index b03110ca..1ca619c3 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -1,3 +1,5 @@ +# This file is licensed under the terms of the expat license, see the file EXPAT. + iconsdir = $(datadir)/icons/hicolor/scalable/apps icons_DATA = scalable/midori.svg diff --git a/icons/wscript_build b/icons/wscript_build index 35cdcbf9..2896e0cf 100644 --- a/icons/wscript_build +++ b/icons/wscript_build @@ -1,5 +1,6 @@ #! /usr/bin/env python # WAF build script for midori +# This file is licensed under the terms of the expat license, see the file EXPAT. def add_image (bld, install_files, category, name): import os diff --git a/katze/Makefile.am b/katze/Makefile.am index f357f6a5..a6b17545 100644 --- a/katze/Makefile.am +++ b/katze/Makefile.am @@ -1,3 +1,5 @@ +# This file is licensed under the terms of the expat license, see the file EXPAT. + INCLUDES = \ $(GTK_CFLAGS) \ $(LIBXML_CFLAGS) diff --git a/katze/wscript_build b/katze/wscript_build index efa43b5e..b3145552 100644 --- a/katze/wscript_build +++ b/katze/wscript_build @@ -1,5 +1,6 @@ #! /usr/bin/env python # WAF build script for midori +# This file is licensed under the terms of the expat license, see the file EXPAT. obj = bld.create_obj ('cc', 'staticlib') obj.name = 'katze' diff --git a/legacy.sh b/legacy.sh index dd4632a3..70867688 100755 --- a/legacy.sh +++ b/legacy.sh @@ -1,4 +1,5 @@ #!/bin/sh +# This file is licensed under the terms of the expat license, see the file EXPAT. echo "no" | glib-gettextize --force --copy intltoolize --copy --force --automake diff --git a/midori/Makefile.am b/midori/Makefile.am index 627c49a5..6219a8ea 100644 --- a/midori/Makefile.am +++ b/midori/Makefile.am @@ -1,3 +1,5 @@ +# This file is licensed under the terms of the expat license, see the file EXPAT. + INCLUDES = \ $(UNIQUE_CFLAGS) \ $(GIO_CFLAGS) \ diff --git a/midori/wscript_build b/midori/wscript_build index 0dfb01a3..af1c06e8 100644 --- a/midori/wscript_build +++ b/midori/wscript_build @@ -1,5 +1,6 @@ #! /usr/bin/env python # WAF build script for midori +# This file is licensed under the terms of the expat license, see the file EXPAT. obj = bld.create_obj ('cc', 'program') obj.target = 'midori' diff --git a/po/wscript_build b/po/wscript_build index 149046b6..fe03f6c6 100644 --- a/po/wscript_build +++ b/po/wscript_build @@ -1,5 +1,6 @@ #! /usr/bin/env python # WAF build script for midori +# This file is licensed under the terms of the expat license, see the file EXPAT. import Params import pproc as subprocess diff --git a/wscript b/wscript index 76e1c4da..b872cfda 100644 --- a/wscript +++ b/wscript @@ -1,5 +1,6 @@ #! /usr/bin/env python # WAF build script for midori +# This file is licensed under the terms of the expat license, see the file EXPAT. import Params import pproc as subprocess