projects / platform / upstream / nasm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0d6066 07c1468)
Merge branch 'nasm-2.03.x'
authorH. Peter Anvin <hpa@zytor.com>
Tue, 17 Jun 2008 04:45:42 +0000 (21:45 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 17 Jun 2008 04:45:42 +0000 (21:45 -0700)
Conflicts:

Makefile.in
Mkfiles/msvc.mak
Mkfiles/netware.mak
Mkfiles/openwcom.mak
Mkfiles/owlinux.mak


Trivial merge
Domain: System / Toolchain;