Gitiles
Code Review Sign In
gerrit.openfyde.cn / chromium.googlesource.com / chromium / deps / nasm / 3e70a213f694b9d22455dfc1a86f4ee26191e4e2
commit3e70a213f694b9d22455dfc1a86f4ee26191e4e2[log] [tgz]
authorH. Peter Anvin (Intel) <hpa@zytor.com>Tue Jun 30 13:48:13 2020 -0700
committerH. Peter Anvin (Intel) <hpa@zytor.com>Tue Jun 30 13:48:13 2020 -0700
tree236cb82a675a60d94cfd33638a2db2b3ff10959e
parent39714f7de7524acfb731bb9dd1c2c5b3ca1e80c6 [diff]
gitattributes: don't try to merge the version file

Don't try to merge the version file... if there is a conflict, keep
the current version.

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
1 file changed
tree: 236cb82a675a60d94cfd33638a2db2b3ff10959e
  1. asm/
  2. autoconf/
  3. common/
  4. config/
  5. contrib/
  6. disasm/
  7. doc/
  8. headers/
  9. include/
  10. macros/
  11. misc/
  12. Mkfiles/
  13. nasmlib/
  14. nsis/
  15. output/
  16. perllib/
  17. rdoff/
  18. stdlib/
  19. test/
  20. tools/
  21. travis/
  22. x86/
  23. .gitattributes
  24. .gitignore
  25. .travis.yml
  26. AUTHORS
  27. autogen.sh
  28. ChangeLog
  29. CHANGES
  30. configure.ac
  31. INSTALL
  32. LICENSE
  33. Makefile.in
  34. nasm.spec.in
  35. nasm.spec.sed
  36. nasm.txt
  37. ndisasm.txt
  38. README.md
  39. SubmittingPatches
  40. version
  41. version.pl
README.md

NASM, the Netwide Assembler

master

Many many developers all over the net respect NASM for what it is: a widespread (thus netwide), portable (thus netwide!), very flexible and mature assembler tool with support for many output formats (thus netwide!!).

Now we have good news for you: NASM is licensed under the "simplified" (2-clause) BSD license. This means its development is open to even wider society of programmers wishing to improve their lovely assembler.

Visit our nasm.us website for more details. We are gradually moving services away from Sourceforge. For our remaining Sourceforge services see here.

With best regards, the NASM crew.