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.
This commit is contained in:
1 parent
aac3522e25
commit
0e9136f9fb
27 files changed
+363
-316
No files matched your search
+13
-5
@@ -1,10 +1,10 @@
|
||||
1987 marked the "The Fourth International Obfuscated C Code Contest"
|
||||
|
||||
Copyright (c) 1987, Landon Curt Noll & Larry Bassel.
|
||||
All Rights Reserved. Permission for personal, educational or non-profit use is
|
||||
granted provided this this copyright and notice are included in its entirety
|
||||
and remains unaltered. All other uses must receive prior permission in writing
|
||||
from both Landon Curt Noll and Larry Bassel.
|
||||
|
||||
Look at the README.md file for the given winner for information
|
||||
on how to compile the winner and how to run the winning program.
|
||||
Look at the winning source and try to figure how it does what it does!
|
||||
You may then wish to look at the Author's comments for even more details.
|
||||
|
||||
The rules for 1987 suggested even more categories than in 1986. Hints
|
||||
for what to do and not to do were also given in the rules. For
|
||||
@@ -19,3 +19,11 @@ published the 1987 winners. Mark Horton included a version of the 1987
|
||||
winners in an appendix of his C book. The first announcement of
|
||||
winners at the Summer 87 Usenix was helped by a small fly that
|
||||
danced all over the foils.
|
||||
|
||||
=-=
|
||||
|
||||
Copyright (c) 1987, Landon Curt Noll & Larry Bassel.
|
||||
All Rights Reserved. Permission for personal, educational or non-profit use is
|
||||
granted provided this this copyright and notice are included in its entirety
|
||||
and remains unaltered. All other uses must receive prior permission in writing
|
||||
from both Landon Curt Noll and Larry Bassel.
|
||||
Reference in new issue
Block a user