summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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.