Merge branch 'nasm-2.03.x'

Conflicts:

	doc/nasmdoc.src
This commit is contained in:
H. Peter Anvin 2008-06-15 21:22:40 -07:00
commit d11c48d910

View File

@ -584,6 +584,7 @@ if \c{-F} is specified.
A complete list of the available debug file formats for an output
format can be seen by issuing the command \i\c{nasm -f <format>
-y}. Not all output formats currently support debugging output.
See \k{opt-y}.
This should not be confused with the \c{-f dbg} output format option which
is not built into NASM by default. For information on how