diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2016-03-07 12:15:40 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2016-03-07 12:15:40 -0800 |
| commit | 6224033738437c4d61a54b9142f82728288ecdfb (patch) | |
| tree | fdef91ebe5d53341929b98820ffe63b24aff5d16 /.gitignore | |
| parent | 0b7969e9a95f2ed7c791ddde87a0a8ab2bb9d5d4 (diff) | |
| parent | 172b840aa35d7018509036a3a7d3c467b331f73c (diff) | |
| download | nasm-6224033738437c4d61a54b9142f82728288ecdfb.tar.gz | |
Merge remote-tracking branch 'origin/nasm-2.12.xx'
Resolved Conflicts:
.gitignore
Makefile.in
assemble.c
configure.in
eval.c
float.c
listing.c
nasm.c
nasmlib.c
output/outform.h
preproc.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -75,7 +75,8 @@ TAGS /version.h /version.mac /version.mak -/version.nsh /version.sed /iflag.c /iflaggen.h +/nsis/version.nsh +/nsis/arch.nsh |