eukara
/
WebSurf
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Official Release 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEVAwUAWDBZAMMN9DnymH10AQrJjAf+LD/v5Wmzy0TtB7TK58Kk7T6/M6XDZLyR
 a0uyUC5iyGZPnljsds+b6rLl94uM4kDZbATXH2NwZk2BI6Evv8X3ah350XTIciX3
 OcaAHb2oajb8ISesvmaUCPZJhB6k9mUhwpuPUSjuQsMB9kevmoz7KOfqYQ6DPxhq
 fY5G/goqgNlpkUJUPWyAudzJLqh5xsDpG1VGdOPmhjPp3vodYLqFihy8R9Co4gby
 fwcgEL8hI1bnYzsst3JJKJjhlDW/fEgdoScV6lTDp7pZv+VwyNFeKckJAlItwRM0
 cXKSViXgxbTDd9r7n+vrP78srVAY6IGiw7/aIS8/DZAMoEbw6gQXOA==
 =2eDi
 -----END PGP SIGNATURE-----

Merge 3.6 release and prepare 3.7 dev
This commit is contained in:
Daniel Silverstone 2016-11-19 13:55:01 +00:00
parent c1a0001226 c56ecfd924
commit f8b95e83bb
8 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
!NetSurf/Resources/en/credits.html,faf
View File

@ -92,7 +92,7 @@ div#DevList ul {
</div>
<div class="footer">
<p>Copyright 2003&ndash;2011 The NetSurf Developers</p>
<p>Copyright 2003&ndash;2016 The NetSurf Developers</p>
</div>
</body>

18
!NetSurf/Resources/en/licence.html,faf
View File

@ -60,25 +60,25 @@ version.</p>
<dl class="components">
<dt><a href="http://www.netsurf-browser.org/">NetSurf</a></dt>
<dd>
<span>&copy; 2002&ndash;2011 The NetSurf Developers</span>
<span>&copy; 2002&ndash;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>&copy; 2007&ndash;2011 John-Mark Bell</span>
<span>&copy; 2007&ndash;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>&copy; 2007&ndash;2011 John-Mark Bell<br>&copy; 2008&ndash;2009 Andrew Sidwell</span>
<span>&copy; 2007&ndash;2016 John-Mark Bell<br>&copy; 2008&ndash;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>&copy; 2007&ndash;2011 John-Mark Bell</span>
<span>&copy; 2007&ndash;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>&copy; 2008&ndash;2009 James Bursa</span>
<span>&copy; 2008&ndash;2009 James Bursa<br>&copy; 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>&copy; 2006 Richard Wilson<br>&copy; 2008 Sean Fox</span>
<span>&copy; 2006 Richard Wilson<br>&copy; 2008 Sean Fox<br>&copy; 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>&copy; 2009&ndash;2011 Vincent Sanders<br>&copy; 2009&ndash;2011 Michael Drake</span>
<span>&copy; 2009&ndash;2016 Vincent Sanders<br>&copy; 2009&ndash;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>&copy; 2009&ndash;2011 NetSurf Browser Project, Daniel Silverstone</span>
<span>&copy; 2009&ndash;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&ndash;2011 The NetSurf Developers</p>
<p>Copyright 2003&ndash;2016 The NetSurf Developers</p>
</div>
</body>

2
!NetSurf/Resources/nl/credits.html,faf
View File

@ -96,7 +96,7 @@ div#DevList ul {
</div>
<div class="footer">
<p>Auteursrecht 2003&ndash;2015 De NetSurf-ontwikkelaars</p>
<p>Auteursrecht 2003&ndash;2016 De NetSurf-ontwikkelaars</p>
</div>
</body>

19
!NetSurf/Resources/nl/licence.html,faf
View File

@ -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>&copy; 2002&ndash;2011 De NetSurf-ontwikkerlaars</span>
<span>&copy; 2002&ndash;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>&copy; 2007&ndash;2011 John-Mark Bell</span>
<span>&copy; 2007&ndash;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>&copy; 2007&ndash;2011 John-Mark Bell<br>&copy; 2008&ndash;2009 Andrew Sidwell</span>
<span>&copy; 2007&ndash;2016 John-Mark Bell<br>&copy; 2008&ndash;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>&copy; 2007&ndash;2011 John-Mark Bell</span>
<span>&copy; 2007&ndash;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>&copy; 2008&ndash;2009 James Bursa</span>
<span>&copy; 2008&ndash;2009 James Bursa<br>&copy; 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>&copy; 2006 Richard Wilson<br>&copy; 2008 Sean Fox</span>
<span>&copy; 2006 Richard Wilson<br>&copy; 2008 Sean Fox<br>&copy; 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>&copy; 2009&ndash;2011 Vincent Sanders<br>&copy; 2009&ndash;2011 Michael Drake</span>
<span>&copy; 2009&ndash;2016 Vincent Sanders<br>&copy; 2009&ndash;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>&copy; 2009&ndash;2011 NetSurf Browser Project, Daniel Silverstone</span>
<span>&copy; 2009&ndash;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&ndash;2015 De NetSurf-ontwikkelaars</p>
<p>Auteursrecht 2003&ndash;2016 De NetSurf-ontwikkelaars</p>
</div>
</body>

4
desktop/version.c
View File

@ -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;

4
frontends/amiga/pkg/netsurf.readme
View File

@ -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
*******************************************

4
frontends/amiga/pkg/netsurf_os3.readme
View File

@ -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.

2
frontends/amiga/version.c
View File

@ -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