diff options
| author | Tim Hatch <tim@timhatch.com> | 2014-04-24 15:34:25 -0400 |
|---|---|---|
| committer | Tim Hatch <tim@timhatch.com> | 2014-04-24 15:34:25 -0400 |
| commit | 9ca27c93bd28d0f76f9cd30f7a9a6b2c822bf473 (patch) | |
| tree | fbbd524a4506e2914cb3eac84d423cccc8a36cf3 /pygments/util.py | |
| parent | a952583945eb294dde2e993dadc8fb31b3ebc3f0 (diff) | |
| parent | 6f1bb16a745f6c9d18ef10001813aceb4a1a8e80 (diff) | |
| download | pygments-9ca27c93bd28d0f76f9cd30f7a9a6b2c822bf473.tar.gz | |
Merged in jrha/pygments-main (pull request #179)
Conflicts:
pygments/lexers/_mapping.py
pygments/lexers/other.py
Diffstat (limited to 'pygments/util.py')
0 files changed, 0 insertions, 0 deletions