diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-07-13 21:41:33 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-07-13 21:41:33 -0400 |
| commit | 340ee009d63596b1352d2f648e9b1d342f447861 (patch) | |
| tree | ad81e0d13de58eedab60ad6ff6d790ec215d4efe /.gitignore | |
| parent | ad01495da81e1892dba3a8d8de7011b00c8a8511 (diff) | |
| parent | 44a0d177f09b3e7c5627c3772c9b406254eaaf64 (diff) | |
| download | nasm-340ee009d63596b1352d2f648e9b1d342f447861.tar.gz | |
Merge branch 'master' into new-preproc
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -61,8 +61,8 @@ /regs.c /regs.h /regvals.c -/test/perf/*.asm /test/golden +/test/perf/*.asm /test/testresults /tokens.h /tokhash.c |