Commit 884aa31d authored by Anton Ertl's avatar Anton Ertl
Browse files

merge fix

parents 3d9f7a6b faadd276

.mailmap

0 → 100644
+11 −0
Original line number Diff line number Diff line 
Bernd Paysan <bernd.paysan@gmx.de> pazsan <pazsan>

Bernd Paysan <bernd.paysan@gmx.de> root <root@net2o.de>

Bernd Paysan <bernd.paysan@gmx.de> U-sunwukong\bernd <bernd@sunwukong.(none)>

Anton Ertl <anton@mips.complang.tuwien.ac.at> anton <anton>

Jens Wilke <jens.wilke@headissues.com> jwilke <jwilke>

David Kühling <dvdkhlng@gmx.de> dvdkhlng <dvdkhlng>

Neal Crook <neal@pinga.free-online.co.uk> crook <crook>

Andreas Kochenburger <minforth@arcor.de> ak042 <ak042>

Lennart Benschop <lennartb@xs4all.nl> benschop <benschop>

Andreas Bolka <a@bolka.at> abolka <abolka>

Darren Bane <unknown> dbane <dbane>

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ before_install: ./install-deps.sh 
script:

  - ./autogen.sh

  - export CC=gcc

  - if [ "${TRAVIS_OS_NAME}" = osx ]; then gcc -v; gcc-8 -v; export CC=gcc-8; fi

  - if [ "${TRAVIS_OS_NAME}" = osx ]; then gcc -v; gcc-9 -v; export CC=gcc-9; fi

  - ./configure --enable-lib CC="$CC $M32"

  - make

  - for i in misc r8c 8086 c165; do ./build-ec $i; done

2012words.fs

+1 −0
Original line number Diff line number Diff line 
\ the additional Forth 200x words and their wordsets and other info



\ Author: Bernd Paysan

\ Copyright (C) 2014 Free Software Foundation, Inc.



\ This file is part of Gforth.

AUTHORS

+12 −3
Original line number Diff line number Diff line
@@ -15,23 +15,32 @@ S: D-81477 München 
S: Germany

P: rsa4096/3B7FA946 60E7 1A15 9357 5330 99A0 AAF9 CAF0 21DB 3B7F A946



N: David Kühling

E: dvdkhlng@gmx.de

D: Emacs integration



N: Gerald Wodni

E: gerald.wodni@gee.at

D: SWIG module for C libraries



N: David Kühling

E: dvdkhlng@gmx.de

D: Emacs integration

N: Heinz Schnitter

E: heinz.schnitter@muenchen-mail.de

D: R8C assembler



N: Jens Wilke

E: jens.wilke@headissue.com

D: Embedded Control versions (non-gcc), decompiler, cross compiler refinement



N: Klaus Kohl-Schöpe

E: kks@designin.de

D: 8086 Gforth EC



N: Neal Crook

E: neal@pinga.free-online.co.uk

D: manual, glossary entries



-----

Authors: Anton Ertl, Bernd Paysan, Jens Wilke

Copyright (C) 1998,2000,2003,2007,2017,2018 Free Software Foundation, Inc.



This file is part of Gforth.

BUGS

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ gforth etags.fs 
16 nov 2005



-----

Authors: Anton Ertl, Bernd Paysan

Copyright (C) 1995,1996,1997,1998,2000,2003,2005,2007 Free Software Foundation, Inc.



This file is part of Gforth.