diff options
| author | Colin Kennedy <colinvfx@gmail.com> | 2019-11-30 16:51:37 -0800 |
|---|---|---|
| committer | Colin Kennedy <colinvfx@gmail.com> | 2019-11-30 16:51:37 -0800 |
| commit | 650c1af91ea8e97755e1b4e3af45ceb2c4dc60b0 (patch) | |
| tree | 6b6e5e9df85a3ef0cab796b23b48e49d4a424a3f /tests/examplefiles/example.usda | |
| parent | f97ba3142032d3e175328cd761016c6a1665bf54 (diff) | |
| parent | 2f271ab82f86d1e54921b6697624665c4970c949 (diff) | |
| download | pygments-git-650c1af91ea8e97755e1b4e3af45ceb2c4dc60b0.tar.gz | |
Merged with master and resolved a minor merge conflict in languages.rst
Diffstat (limited to 'tests/examplefiles/example.usda')
0 files changed, 0 insertions, 0 deletions