diff options
author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2016-11-19 13:55:01 +0000 |
---|---|---|
committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2016-11-19 13:55:01 +0000 |
commit | f8b95e83bbcb3309c8c5d83c55d20b5479a29c4b (patch) | |
tree | 1fab09fa50e4b0e7b2daf94416411c691ea6abe3 | |
parent | c1a0001226d918571006a87dd22e13dd32f80e84 (diff) | |
parent | c56ecfd924b16d15bf74385c4d556a6b7002e8a6 (diff) | |
download | netsurf-f8b95e83bbcb3309c8c5d83c55d20b5479a29c4b.tar.gz netsurf-f8b95e83bbcb3309c8c5d83c55d20b5479a29c4b.tar.bz2 |
Merge 3.6 release and prepare 3.7 dev
-rw-r--r-- | !NetSurf/Resources/en/credits.html,faf | 2 | ||||
-rw-r--r-- | !NetSurf/Resources/en/licence.html,faf | 18 | ||||
-rw-r--r-- | !NetSurf/Resources/nl/credits.html,faf | 2 | ||||
-rw-r--r-- | !NetSurf/Resources/nl/licence.html,faf | 19 | ||||
-rw-r--r-- | desktop/version.c | 4 | ||||
-rwxr-xr-x | frontends/amiga/pkg/netsurf.readme | 4 | ||||
-rw-r--r-- | frontends/amiga/pkg/netsurf_os3.readme | 4 | ||||
-rw-r--r-- | frontends/amiga/version.c | 2 |
8 files changed, 28 insertions, 27 deletions
diff --git a/!NetSurf/Resources/en/credits.html,faf b/!NetSurf/Resources/en/credits.html,faf index 96327e756..b7098df44 100644 --- a/!NetSurf/Resources/en/credits.html,faf +++ b/!NetSurf/Resources/en/credits.html,faf @@ -92,7 +92,7 @@ div#DevList ul { </div> <div class="footer"> -<p>Copyright 2003–2011 The NetSurf Developers</p> +<p>Copyright 2003–2016 The NetSurf Developers</p> </div> </body> diff --git a/!NetSurf/Resources/en/licence.html,faf b/!NetSurf/Resources/en/licence.html,faf index 7b3aef628..da0df454e 100644 --- a/!NetSurf/Resources/en/licence.html,faf +++ b/!NetSurf/Resources/en/licence.html,faf @@ -60,25 +60,25 @@ version.</p> <dl class="components"> <dt><a href="http://www.netsurf-browser.org/">NetSurf</a></dt> <dd> -<span>© 2002–2011 The NetSurf Developers</span> +<span>© 2002–2016 The NetSurf Developers</span> <span><a href="#gplv2">GPLv2</a></span> </dd> <dt><a href="http://www.netsurf-browser.org/projects/libcss/">LibCSS</a></dt> <dd> -<span>© 2007–2011 John-Mark Bell</span> +<span>© 2007–2016 John-Mark Bell</span> <span><a href="#mit">MIT</a></span> </dd> <dt><a href="http://www.netsurf-browser.org/projects/hubbub/">Hubbub</a></dt> <dd> -<span>© 2007–2011 John-Mark Bell<br>© 2008–2009 Andrew Sidwell</span> +<span>© 2007–2016 John-Mark Bell<br>© 2008–2009 Andrew Sidwell</span> <span><a href="#mit">MIT</a></span> </dd> <dt><a href="http://www.netsurf-browser.org/projects/libparserutils/">LibParserUtils</a></dt> <dd> -<span>© 2007–2011 John-Mark Bell</span> +<span>© 2007–2016 John-Mark Bell</span> <span><a href="#mit">MIT</a></span> </dd> @@ -102,19 +102,19 @@ version.</p> <dt><a href="http://www.netsurf-browser.org/projects/libsvgtiny">Libsvgtiny</a></dt> <dd> -<span>© 2008–2009 James Bursa</span> +<span>© 2008–2009 James Bursa<br>© 2016 Michael Drake</span> <span><a href="#mit">MIT</a></span> </dd> <dt><a href="http://www.netsurf-browser.org/projects/libnsbmp/">Libnsbmp</a></dt> <dd> -<span>© 2006 Richard Wilson<br>© 2008 Sean Fox</span> +<span>© 2006 Richard Wilson<br>© 2008 Sean Fox<br>© 2016 Vincent Sanders</span> <span><a href="#mit">MIT</a></span> </dd> <dt><a href="http://www.netsurf-browser.org/projects/libnsfb/">Libnsfb</a></dt> <dd> -<span>© 2009–2011 Vincent Sanders<br>© 2009–2011 Michael Drake</span> +<span>© 2009–2016 Vincent Sanders<br>© 2009–2016 Michael Drake</span> <span><a href="#mit">MIT</a></span> </dd> @@ -126,7 +126,7 @@ version.</p> <dt><a href="http://www.netsurf-browser.org/projects/libwapcaplet">LibWapcaplet</a></dt> <dd> -<span>© 2009–2011 NetSurf Browser Project, Daniel Silverstone</span> +<span>© 2009–2016 NetSurf Browser Project, Daniel Silverstone</span> <span><a href="#mit">MIT</a></span> </dd> </dl> @@ -1865,7 +1865,7 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. </div> <div class="footer"> -<p>Copyright 2003–2011 The NetSurf Developers</p> +<p>Copyright 2003–2016 The NetSurf Developers</p> </div> </body> diff --git a/!NetSurf/Resources/nl/credits.html,faf b/!NetSurf/Resources/nl/credits.html,faf index 163751fc5..3cae27a54 100644 --- a/!NetSurf/Resources/nl/credits.html,faf +++ b/!NetSurf/Resources/nl/credits.html,faf @@ -96,7 +96,7 @@ div#DevList ul { </div>
<div class="footer">
-<p>Auteursrecht 2003–2015 De NetSurf-ontwikkelaars</p>
+<p>Auteursrecht 2003–2016 De NetSurf-ontwikkelaars</p>
</div>
</body>
diff --git a/!NetSurf/Resources/nl/licence.html,faf b/!NetSurf/Resources/nl/licence.html,faf index d0c16505b..d3272c75c 100644 --- a/!NetSurf/Resources/nl/licence.html,faf +++ b/!NetSurf/Resources/nl/licence.html,faf @@ -63,25 +63,25 @@ dan verwijder deze uitzonderingverklaring uit uw eigen versie.</p> <dl class="components"> <dt><a href="http://www.netsurf-browser.org/">NetSurf</a></dt> <dd> -<span>© 2002–2011 De NetSurf-ontwikkerlaars</span> +<span>© 2002–2016 De NetSurf-ontwikkerlaars</span> <span><a href="#gplv2">GPLv2</a></span> </dd> <dt><a href="http://www.netsurf-browser.org/projects/libcss/">LibCSS</a></dt> <dd> -<span>© 2007–2011 John-Mark Bell</span> +<span>© 2007–2016 John-Mark Bell</span> <span><a href="#mit">MIT</a></span> </dd> <dt><a href="http://www.netsurf-browser.org/projects/hubbub/">Hubbub</a></dt> <dd> -<span>© 2007–2011 John-Mark Bell<br>© 2008–2009 Andrew Sidwell</span> +<span>© 2007–2016 John-Mark Bell<br>© 2008–2009 Andrew Sidwell</span> <span><a href="#mit">MIT</a></span> </dd> <dt><a href="http://www.netsurf-browser.org/projects/libparserutils/">LibParserUtils</a></dt> <dd> -<span>© 2007–2011 John-Mark Bell</span> +<span>© 2007–2016 John-Mark Bell</span> <span><a href="#mit">MIT</a></span> </dd> @@ -105,19 +105,19 @@ dan verwijder deze uitzonderingverklaring uit uw eigen versie.</p> <dt><a href="http://www.netsurf-browser.org/projects/libsvgtiny">Libsvgtiny</a></dt> <dd> -<span>© 2008–2009 James Bursa</span> +<span>© 2008–2009 James Bursa<br>© 2016 Michael Drake</span> <span><a href="#mit">MIT</a></span> </dd> <dt><a href="http://www.netsurf-browser.org/projects/libnsbmp/">Libnsbmp</a></dt> <dd> -<span>© 2006 Richard Wilson<br>© 2008 Sean Fox</span> +<span>© 2006 Richard Wilson<br>© 2008 Sean Fox<br>© 2016 Vincent Sanders</span> <span><a href="#mit">MIT</a></span> </dd> <dt><a href="http://www.netsurf-browser.org/projects/libnsfb/">Libnsfb</a></dt> <dd> -<span>© 2009–2011 Vincent Sanders<br>© 2009–2011 Michael Drake</span> +<span>© 2009–2016 Vincent Sanders<br>© 2009–2016 Michael Drake</span> <span><a href="#mit">MIT</a></span> </dd> @@ -129,11 +129,12 @@ dan verwijder deze uitzonderingverklaring uit uw eigen versie.</p> <dt><a href="http://www.netsurf-browser.org/projects/libwapcaplet">LibWapcaplet</a></dt> <dd> -<span>© 2009–2011 NetSurf Browser Project, Daniel Silverstone</span> +<span>© 2009–2016 NetSurf Browser Project, Daniel Silverstone</span> <span><a href="#mit">MIT</a></span> </dd> </dl> + <h3>Onderdelen van derden</h3> <dl class="components"> @@ -1871,7 +1872,7 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. </div> <div class="footer"> -<p>Auteursrecht 2003–2015 De NetSurf-ontwikkelaars</p> +<p>Auteursrecht 2003–2016 De NetSurf-ontwikkelaars</p> </div> </body> diff --git a/desktop/version.c b/desktop/version.c index 6828f82ca..6126c5b99 100644 --- a/desktop/version.c +++ b/desktop/version.c @@ -20,11 +20,11 @@ #include "desktop/version.h" -const char * const netsurf_version = "3.6 (Dev" +const char * const netsurf_version = "3.7 (Dev" #if defined(CI_BUILD) " CI #" CI_BUILD #endif ")" ; const int netsurf_version_major = 3; -const int netsurf_version_minor = 6; +const int netsurf_version_minor = 7; diff --git a/frontends/amiga/pkg/netsurf.readme b/frontends/amiga/pkg/netsurf.readme index 3e929b040..817e07435 100755 --- a/frontends/amiga/pkg/netsurf.readme +++ b/frontends/amiga/pkg/netsurf.readme @@ -2,11 +2,11 @@ Short: Fast CSS capable web browser Uploader: chris@unsatisfactorysoftware.co.uk (Chris Young) Author: NetSurf contributors (OS4 port by Chris Young) Type: comm/www -Version: 3.6 +Version: 3.8 Requires: dev/misc/guigfxlib.lha Architecture: ppc-amigaos >= 4.0.0 -This is NetSurf 3.6 for AmigaOS 4 (native frontend). +This is NetSurf 3.8 for AmigaOS 4 (native frontend). For the latest version, visit http://www.netsurf-browser.org ******************************************* diff --git a/frontends/amiga/pkg/netsurf_os3.readme b/frontends/amiga/pkg/netsurf_os3.readme index d9c0eb58a..087e586f9 100644 --- a/frontends/amiga/pkg/netsurf_os3.readme +++ b/frontends/amiga/pkg/netsurf_os3.readme @@ -2,11 +2,11 @@ Short: Fast CSS capable web browser Uploader: chris@unsatisfactorysoftware.co.uk (Chris Young) Author: NetSurf contributors (OS4 port by Chris Young) Type: comm/www -Version: 3.6 BETA +Version: 3.8 BETA Requires: dev/misc/guigfxlib.lha Architecture: m68k-amigaos >= 3.5.0 -This is NetSurf 3.6 BETA for AmigaOS 3. +This is NetSurf 3.8 BETA for AmigaOS 3. It is built off of the OS4 (Reaction) frontend. Requirements are AmigaOS 3.5 or 3.9, 32MB RAM. diff --git a/frontends/amiga/version.c b/frontends/amiga/version.c index bc31d0c96..f7ecc2ecc 100644 --- a/frontends/amiga/version.c +++ b/frontends/amiga/version.c @@ -25,7 +25,7 @@ * they are higher than CI builds, and make this (slightly) less confusing. */ #define NETSURF_VERSION_MAJOR "3" -#define NETSURF_VERSION_MINOR_EXTERNAL "6" +#define NETSURF_VERSION_MINOR_EXTERNAL "8" #if defined(CI_BUILD) #define NETSURF_VERSION_MINOR CI_BUILD #else |