diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2018-02-06 14:50:08 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2018-02-06 14:50:08 -0800 |
| commit | d08b1c4370fb6bfe3c13cfde953305e99783f28b (patch) | |
| tree | 73e0dba9f84d242777e5fe1eca8c45505cee972d | |
| parent | a7ecf2646d6c80b994be7d340140379d580050cf (diff) | |
| parent | 7c640b757909d6d88242b4c2016d8121dddd2b48 (diff) | |
| download | nasm-d08b1c4370fb6bfe3c13cfde953305e99783f28b.tar.gz | |
Merge remote-tracking branch 'origin/nasm-2.13.xx' into nasm-2.13.xx
Resolved Conflicts:
include/iflag.h
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
| -rw-r--r-- | version | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -2.13.03rc3 +2.13.03rc4 |