Merge branch 'nasm-2.03.x'

Conflicts:

	Makefile.in
	Mkfiles/msvc.mak
	Mkfiles/netware.mak
	Mkfiles/openwcom.mak
	Mkfiles/owlinux.mak

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 76ec1df..4f2328f 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -22,7 +22,7 @@ TEXI2DVI        = texi2dvi
 PS2PDF          = ps2pdf               # Part of GhostScript
 
 SRCS           = nasmdoc.src
-OUT            = info html nasmdoc.ps nasmdoc.pdf
+OUT            = info html nasmdoc.txt nasmdoc.ps nasmdoc.pdf
 
 # exports
 export srcdir

diff --git a/version b/version
index 42ea6ce..0551701 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-2.03
+2.03.01