Cody Boone Ferguson 0e9136f9fb Attempt to fix conflicts ...

As some commits from yesterday and this morning caused conflicts with
commits I made last week I'm trying to fix it on the branch that I
believe introduced the changes. If this does not work I do not know what
I'll do but it have to be done another time.

2023-02-22 07:29:22 -08:00

..

algmyr

fixed issue of make pluto echo

2023-02-12 22:26:59 -08:00

anderson

fixed issue of make pluto echo

2023-02-12 22:26:59 -08:00

bellard

Formatting fix in 2018/bellard/README.md

2023-02-15 10:30:40 -08:00

burton1

fixed issue of make pluto echo

2023-02-12 22:26:59 -08:00

burton2

Add missing file in commit 017230

2023-02-16 05:05:34 -08:00

ciura

fixed issue of make pluto echo

2023-02-12 22:26:59 -08:00

endoh1

fixed issue of make pluto echo

2023-02-12 22:26:59 -08:00

endoh2

fixed issue of make pluto echo

2023-02-12 22:26:59 -08:00

ferguson

Attempt to fix conflicts

2023-02-22 07:29:22 -08:00

giles

fixed issue of make pluto echo

2023-02-12 22:26:59 -08:00

hou

fixed issue of make pluto echo

2023-02-12 22:26:59 -08:00

mills

fixed issue of make pluto echo

2023-02-12 22:26:59 -08:00

poikola

fixed issue of make pluto echo

2023-02-12 22:26:59 -08:00

vokes

fixed issue of make pluto echo

2023-02-12 22:26:59 -08:00

yang

fixed issue of make pluto echo

2023-02-12 22:26:59 -08:00

2018.tar.bz2

Add preview of 1984-2019

2020-12-30 16:57:03 -08:00

guidelines.txt

Fix references of 'the the' to be just 'the'

2023-02-15 09:23:58 -08:00

hint.css

Add preview of 1984-2019

2020-12-30 16:57:03 -08:00

iocccsize.c

Add preview of 1984-2019

2020-12-30 16:57:03 -08:00

iocccsize.mk

Add preview of 1984-2019

2020-12-30 16:57:03 -08:00

Makefile

Add preview of 1984-2019

2020-12-30 16:57:03 -08:00

MANIFEST

Change references of hint.text etc. to README.md

2023-02-08 05:16:04 -08:00

rules.txt

Change references of 'EMail' to '[Ee]mail'

2023-02-10 06:01:22 -08:00

whowon.html

Add preview of 1984-2019

2020-12-30 16:57:03 -08:00