summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwlestes <wlestes>2001-09-20 16:22:08 +0000
committerwlestes <wlestes>2001-09-20 16:22:08 +0000
commitd1c9782ab1c9e8555dc91be9daa5b08d4bc9bb70 (patch)
tree611fa6238a76e375bb6443c5364f121aef211ecd
parentc471537b1c12eab4e52fbcf7f09396d01f1c3e5c (diff)
downloadflex-d1c9782ab1c9e8555dc91be9daa5b08d4bc9bb70.tar.gz
fix the NEWS file; mention that flex now handles \r as an eol character
-rw-r--r--NEWS14
1 files changed, 1 insertions, 13 deletions
diff --git a/NEWS b/NEWS
index bd53ab5..5435e68 100644
--- a/NEWS
+++ b/NEWS
@@ -44,16 +44,6 @@ But the inverse is still true.
** Support for bison variables yylval and yylloc added.
-<<<<<<< NEWS
-** automake support for the build process
-
-** manual is now in texinfo/info format
-
-*** flex.1 removed from distribution
-
-** flex no longer generates C-language scanners with C++-style
- comments
-=======
** automake support for the build process
** manual is now in texinfo/info format
@@ -65,9 +55,7 @@ But the inverse is still true.
** flex now generates scanners in c++ which are compatible with
recent c++ compilers
->>>>>>> 2.60
-** flex now generates scanners in c++ which are compatible with
- recent c++ compilers
+** flex input scanner now recognizes '\r' as an EOL character
See the file ONEWS for changes in earlier releases.