diff options
| author | Cyrill Gorcunov <gorcunov@gmail.com> | 2011-04-06 19:12:17 +0400 |
|---|---|---|
| committer | Cyrill Gorcunov <gorcunov@gmail.com> | 2011-04-06 19:12:17 +0400 |
| commit | a4f98b3aabcd202d9aedb72f86c4f40fd0102871 (patch) | |
| tree | 1b9e48e54966abb05b166c3d11def0c54ade9780 /doc | |
| parent | 2250195a1aea0e7ffcb329563acc1dde00c14452 (diff) | |
| parent | a4b1c5c68e05e210780481a48eddf54b73289c21 (diff) | |
| download | nasm-a4f98b3aabcd202d9aedb72f86c4f40fd0102871.tar.gz nasm-a4f98b3aabcd202d9aedb72f86c4f40fd0102871.tar.bz2 nasm-a4f98b3aabcd202d9aedb72f86c4f40fd0102871.zip | |
Merge branch 'nasm-2.09.xx'
Conflicts:
nasm.h
version
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/changes.src | 9 | ||||
| -rw-r--r-- | doc/nasmdoc.src | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/doc/changes.src b/doc/changes.src index 302e9d1..a3ba18c 100644 --- a/doc/changes.src +++ b/doc/changes.src @@ -19,6 +19,15 @@ since 2007. To force a specific form, use the \c{STRICT} keyword, see \k{strict}. +\S{cl-2.09.08} Version 2.09.08 + +\b Fix \c{__OUTPUT_FORMAT__} assignment when output driver alias + is used. For example when \c{-f elf} is used \c{__OUTPUT_FORMAT__} + must be set to \c{elf}, if \c{-f elf32} is used \c{__OUTPUT_FORMAT__} + must be assigned accordingly, i.e. to \c{elf32}. The rule applies to + all output driver aliases. See \k{ofmtm}. + + \S{cl-2.09.07} Version 2.09.07 \b Fix attempts to close same file several times diff --git a/doc/nasmdoc.src b/doc/nasmdoc.src index 515a8bb..34e8386 100644 --- a/doc/nasmdoc.src +++ b/doc/nasmdoc.src @@ -1,6 +1,6 @@ \# -------------------------------------------------------------------------- \# -\# Copyright 1996-2010 The NASM Authors - All Rights Reserved +\# Copyright 1996-2011 The NASM Authors - All Rights Reserved \# See the file AUTHORS included with the NASM distribution for \# the specific copyright holders. \# @@ -35,7 +35,7 @@ \# \M{category}{Programming} \M{title}{NASM - The Netwide Assembler} -\M{year}{1996-2010} +\M{year}{1996-2011} \M{author}{The NASM Development Team} \M{copyright_tail}{-- All Rights Reserved} \M{license}{This document is redistributable under the license given in the file "LICENSE" distributed in the NASM archive.} @@ -334,7 +334,7 @@ distribution archive, for the license conditions under which you may use NASM. NASM is now under the so-called 2-clause BSD license, also known as the simplified BSD license. -Copyright 1996-2010 the NASM Authors - All rights reserved. +Copyright 1996-2011 the NASM Authors - All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are |