diff options
author | Tim Hatch <tim@timhatch.com> | 2014-04-14 10:28:01 -0400 |
---|---|---|
committer | Tim Hatch <tim@timhatch.com> | 2014-04-14 10:28:01 -0400 |
commit | f5744a781abb9deb7508118ea0b308cb4724435e (patch) | |
tree | 97eb493774b49705c9fb1dcda61b44ec8db76b9d /pygments/lexers/compiled.py | |
parent | 948dffaaeae77b83aa3e506495c6a89e5093d869 (diff) | |
parent | b570f7c18d9dea76f6122bf8491aa2370e9264e6 (diff) | |
download | pygments-f5744a781abb9deb7508118ea0b308cb4724435e.tar.gz |
Merge remote-tracking branch 'pr230/master'
Conflicts:
pygments/formatters/latex.py
Diffstat (limited to 'pygments/lexers/compiled.py')
0 files changed, 0 insertions, 0 deletions