diff options
| author | Ole Loots <ole@monochrom.net> | 2013-01-31 19:28:26 +0100 |
|---|---|---|
| committer | Ole Loots <ole@monochrom.net> | 2013-01-31 19:28:26 +0100 |
| commit | 0703404654d2a40cacae2d94c6e0e22ca28b4acf (patch) | |
| tree | bfdbe1e8952814f73a6b0e190ae0a77fd0cfc7bd /!NetSurf | |
| parent | 54f719aa960159c5b1978846223732c9669ca7fa (diff) | |
| parent | 89856f55929907642013e45435b9d18cd1fafe36 (diff) | |
| download | netsurf-0703404654d2a40cacae2d94c6e0e22ca28b4acf.tar.gz netsurf-0703404654d2a40cacae2d94c6e0e22ca28b4acf.tar.bz2 | |
Merge branch 'master' into mono/removing-windom-dependencymono/removing-windom-dependency
Conflicts:
atari/toolbar.c
Diffstat (limited to '!NetSurf')
| -rw-r--r-- | !NetSurf/!Boot,feb | 11 | ||||
| -rw-r--r-- | !NetSurf/ChkSprites,ffb | bin | 0 -> 881 bytes |
2 files changed, 3 insertions, 8 deletions
diff --git a/!NetSurf/!Boot,feb b/!NetSurf/!Boot,feb index b1d9edc3d..1ba2ebde2 100644 --- a/!NetSurf/!Boot,feb +++ b/!NetSurf/!Boot,feb @@ -43,14 +43,9 @@ If (("<NetSurf$Publisher>" = "") OR ("<NetSurf$ForceVars>" = "1")) Then Set NetS If (("<NetSurf$Description>" = "") OR ("<NetSurf$ForceVars>" = "1")) Then Set NetSurf$Description "Web browser" | NetSurf Sprites -| -| The sprite file used is based on the OS and SpriteExtend versions: -| RO <> 5 and SpriteExtend < 1.50 uses !Sprites<nn> -| RO <> 5 and SpriteExtend >= 1.50 uses ASprites<nn> -| RO = 5 uses 5Sprites<nn> -Set NetSurf$Sprites <NetSurf$Dir>.ASprites -RMEnsure SpriteExtend 1.50 Set NetSurf$Sprites <NetSurf$Dir>.!Sprites -If (("<Boot$OSVersion>" >= "500") AND ("<Boot$OSVersion>" < "600")) Then IconSprites <NetSurf$Dir>.5Sprites Else IconSprites <NetSurf$Sprites> +Set NetSurf$Sprites "!Sprites" +/<NetSurf$Dir>.ChkSprites +IconSprites <NetSurf$Dir>.<NetSurf$Sprites> Unset NetSurf$Sprites | Acorn URI protocol diff --git a/!NetSurf/ChkSprites,ffb b/!NetSurf/ChkSprites,ffb Binary files differnew file mode 100644 index 000000000..52e456ccc --- /dev/null +++ b/!NetSurf/ChkSprites,ffb |