summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-06-15 21:01:25 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-06-15 21:01:25 -0700
commitc25a5d01acbcbf3af0816b98cd277191736b9483 (patch)
tree852bd1d03af8ccde0a0ed8746f90bfb4dedaeae4
parent85a6670ebeca5d85234485cb42f26abf87c64815 (diff)
parentfe2c362e3f82cbbfc2b3ea4050d559a13d89d5bc (diff)
downloadnasm-c25a5d01acbcbf3af0816b98cd277191736b9483.tar.gz
nasm-c25a5d01acbcbf3af0816b98cd277191736b9483.tar.bz2
nasm-c25a5d01acbcbf3af0816b98cd277191736b9483.zip
Merge branch 'nasm-2.03.x'
Conflicts: CHANGES
-rw-r--r--CHANGES4
1 files changed, 2 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index be74bca..1b9b75b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,8 +6,8 @@
* The Postscript/PDF documentation has been reformatted.
* __utf16__ and __utf32__ operators to generate UTF-16 and UTF-32 strings.
-2.03p1 (?)
-------
+2.03.01
+-------
* Fix buffer overflow in the listing module.
* Fix the handling of hexadecimal escape codes in `...` strings.