summaryrefslogtreecommitdiff
path: root/pygments/lexers/asm.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-04-05 09:04:33 +0200
committerGeorg Brandl <georg@python.org>2013-04-05 09:04:33 +0200
commite3a78c5d8d322c10d456ff29ab8d6f08a0a061e3 (patch)
treeaf39e371f14b29b3508c75f5af9c3cbdbfd4e05d /pygments/lexers/asm.py
parent325a7f391af3e449a8ee20f24403da45f3149211 (diff)
parent391833e144e961937abe20adfe6b67b1b14ea993 (diff)
downloadpygments-e3a78c5d8d322c10d456ff29ab8d6f08a0a061e3.tar.gz
Merged in gentoo90/pygments-main (pull request #167)
Minor fixes for RPMSpec and NSIS lexers
Diffstat (limited to 'pygments/lexers/asm.py')
-rw-r--r--pygments/lexers/asm.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pygments/lexers/asm.py b/pygments/lexers/asm.py
index 7ff64bcc..f080327b 100644
--- a/pygments/lexers/asm.py
+++ b/pygments/lexers/asm.py
@@ -244,7 +244,7 @@ class LlvmLexer(RegexLexer):
r'|align|addrspace|section|alias|module|asm|sideeffect|gc|dbg'
r'|ccc|fastcc|coldcc|x86_stdcallcc|x86_fastcallcc|arm_apcscc'
- r'|arm_aapcscc|arm_aapcs_vfpcc'
+ r'|arm_aapcscc|arm_aapcs_vfpcc|ptx_device|ptx_kernel'
r'|cc|c'