summaryrefslogtreecommitdiff
path: root/pygments/lexers/_mapping.py
diff options
context:
space:
mode:
authorTim Hatch <tim@timhatch.com>2014-04-14 14:16:40 -0400
committerTim Hatch <tim@timhatch.com>2014-04-14 14:16:40 -0400
commit60128094a0145a00675fa96364e437aec2c69e51 (patch)
tree26560e647c276f1b1184040d8e65c72d8c533f53 /pygments/lexers/_mapping.py
parent228c6ac80f768b295fb972da2f2f9f67dd2be055 (diff)
parent5771948f66dd1fc4a33f3ba6f839949467418355 (diff)
downloadpygments-60128094a0145a00675fa96364e437aec2c69e51.tar.gz
Merged in buildersbrewery/pygments-main (pull request #296)
Conflicts: pygments/lexers/other.py
Diffstat (limited to 'pygments/lexers/_mapping.py')
0 files changed, 0 insertions, 0 deletions