aboutsummaryrefslogtreecommitdiffstats
path: root/asm/pptok.dat
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2016-10-04 14:09:07 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2016-10-04 14:09:07 -0700
commite93572e6becbc68d3da0fb869c8feba8edafec47 (patch)
tree9dc9c820d253f29662b7e3aa6db3be933bb1aded /asm/pptok.dat
parent436e367874fc488a9d7e9196d1366715c4f05c05 (diff)
parent3f87a2ac50b018ec463beaf702cb9779bdbe97b3 (diff)
downloadnasm-e93572e6becbc68d3da0fb869c8feba8edafec47.tar.gz
nasm-e93572e6becbc68d3da0fb869c8feba8edafec47.tar.xz
nasm-e93572e6becbc68d3da0fb869c8feba8edafec47.zip
Merge remote-tracking branch 'origin/nasm-2.12.xx'
Diffstat (limited to 'asm/pptok.dat')
-rw-r--r--asm/pptok.dat3
1 files changed, 2 insertions, 1 deletions
diff --git a/asm/pptok.dat b/asm/pptok.dat
index b78d138a..a2c64d0a 100644
--- a/asm/pptok.dat
+++ b/asm/pptok.dat
@@ -1,6 +1,6 @@
## --------------------------------------------------------------------------
##
-## Copyright 1996-2010 The NASM Authors - All Rights Reserved
+## Copyright 1996-2016 The NASM Authors - All Rights Reserved
## See the file AUTHORS included with the NASM distribution for
## the specific copyright holders.
##
@@ -78,6 +78,7 @@
%macro
%pathsearch
%pop
+%pragma
%push
%rep
%repl