diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2016-05-16 21:24:26 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2016-05-16 21:27:33 -0700 |
| commit | a87c5e4c872b9a28f03b786b95c23d07696d1eaf (patch) | |
| tree | 5d7457a04ba30c68e63d7800a8411ef168672231 /.gitignore | |
| parent | 2c9b6ad3d9da2e57e695fd4ae2d612bd83aecaf4 (diff) | |
| parent | acbf8f0e1972eb690c91c5bca5b8c1c960dde4b5 (diff) | |
| download | nasm-a87c5e4c872b9a28f03b786b95c23d07696d1eaf.tar.gz | |
Merge remote-tracking branch 'origin/nasm-2.12.xx'
Resolved Conflicts:
.gitignore
Makefile.in
Mkfiles/msvc.mak
Mkfiles/netware.mak
Mkfiles/openwcom.mak
Mkfiles/owlinux.mak
preproc-nop.c
preproc.c
version
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -3,6 +3,7 @@ *.dbg *.exe *.lib +*.i *.lst *.o *.o64 @@ -12,8 +13,9 @@ *.out *.pdb *.rej -*.xml +*.s *.swp +*.xml .*swo *~ \#* @@ -40,6 +42,7 @@ TAGS /doc/*.txt /doc/Makefile /doc/inslist.src +/doc/version.src /doc/html /doc/info /insnsa.c |