aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2012-03-04 11:42:36 -0800
committerH. Peter Anvin <hpa@zytor.com>2012-03-04 11:42:41 -0800
commit1f23dab27cbed56f03cae2341c841b86075f12e7 (patch)
tree9f43f626290295595f6231de38bb0c8250b61166
parent500ddabcd35f18421fc36dda945adcb212b595a3 (diff)
parent65ff09a9d8159f36b135de98b03f288fda95b1a0 (diff)
downloadnasm-new-preproc.tar.gz
nasm-new-preproc.tar.xz
nasm-new-preproc.zip
Merge branch 'master' into new-preprocnew-preproc
This is a dummy merge to allow us to do backmerges from the master branch without git trying to redo the backport of the old preprocessor on us. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
0 files changed, 0 insertions, 0 deletions