diff options
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -1,4 +1,7 @@ -<<<<<<< HEAD +2015-02-08 Arnold D. Robbins <arnold@skeeve.com> + + * io.c: Make it "NONFATAL" everywhere. + 2015-02-08 Andrew J. Schorr <aschorr@telemetry-investments.com> * awk.h (RED_NON_FATAL): Removed. @@ -17,7 +20,7 @@ * awk.h (is_non_fatal_std): Declare new function. * io.c (is_non_fatal_std): New function. * builtin.c (efwrite): Call it. -======= + 2015-02-07 Arnold D. Robbins <arnold@skeeve.com> * regcomp.c, regex.c, regex.h, regex_internal.c, regex_internal.h, @@ -119,7 +122,6 @@ * awkgram.y (extensions_used): New variable. Set it on @load. (do_add_scrfile): Set it on -l. (process_deferred): Check it also. ->>>>>>> master 2014-12-24 Arnold D. Robbins <arnold@skeeve.com> |