aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorH. Peter Anvin (Intel) <hpa@zytor.com>2020-06-27 16:52:02 -0700
committerH. Peter Anvin (Intel) <hpa@zytor.com>2020-06-27 16:52:02 -0700
commitc59337797f2dac6c89c66440f3d30d468adf5bbc (patch)
tree56b3769fce933ffbcf2180124f925465acbd6043 /.travis.yml
parent513e19c8da06745525492b58795d8d8caa545049 (diff)
parent444905e48bc2e4e428064b3ad5ec6d6c5d23d2f1 (diff)
downloadnasm-master.tar.gz
nasm-master.tar.xz
nasm-master.zip
Merge remote-tracking branch 'origin/nasm-2.15.xx'HEADmaster
Resolved Conflicts: version Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions