summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-10-29 10:53:37 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-10-29 10:53:37 -0700
commitfd366a9db42dfbbaeea31faa0bf5862c44c8c32b (patch)
tree07d3de8c1e25cfd49268c9501412697d15405ea1
parentea2c1f9b46175b426c1bce800e591f06ddcdf482 (diff)
parent32f58028dab2aebfcf201f0daba4d26c0c1d1dee (diff)
downloadnasm-fd366a9db42dfbbaeea31faa0bf5862c44c8c32b.tar.gz
Merge commit 'nasm-2.05.01'
Conflicts: doc/changes.src
-rw-r--r--doc/changes.src5
-rw-r--r--version2
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/changes.src b/doc/changes.src
index cf20fc3b..d32aaf55 100644
--- a/doc/changes.src
+++ b/doc/changes.src
@@ -18,6 +18,11 @@ since 2007.
\c{%[...]} if macro expansion is desired.
+\S{cl-2.05.01} Version 2.05.01
+
+\b Fix the \c{-w}/\c{-W} option parsing, which was broken in NASM 2.05.
+
+
\S{cl-2.05} Version 2.05
\b Fix redundant REX.W prefix on \c{JMP reg64}.
diff --git a/version b/version
index fc22f6f1..7dc26981 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.05
+2.05.01