diff options
| author | Matthäus G. Chajdas <dev@anteru.net> | 2020-01-07 21:10:52 +0100 |
|---|---|---|
| committer | Matthäus G. Chajdas <dev@anteru.net> | 2020-01-07 21:10:52 +0100 |
| commit | c7751058ec70e380fa57b7a8db102c1a8a37c25c (patch) | |
| tree | e1097d74aedbe4aef48f9fdcab0c3b74ce48ae9f /AUTHORS | |
| parent | d55d8be8da86fb5a273263375fab90993ddb7e9e (diff) | |
| parent | 4f8b0b66ebb7ea5695441d5a97ac836b75e97e7a (diff) | |
| download | pygments-git-c7751058ec70e380fa57b7a8db102c1a8a37c25c.tar.gz | |
Merge branch 'master' into 671/upsuper/webidl
This allows us to resolve the merge conflict properly.
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -32,9 +32,10 @@ Other contributors, listed alphabetically, are: * Sébastien Bigaret -- QVT Operational lexer * Jarrett Billingsley -- MiniD lexer * Adam Blinkinsop -- Haskell, Redcode lexers -* Stéphane Blondon -- SGF lexer +* Stéphane Blondon -- SGF and Sieve lexers * Frits van Bommel -- assembler lexers * Pierre Bourdon -- bugfixes +* Martijn Braam -- Kernel log lexer * Matthias Bussonnier -- ANSI style handling for terminal-256 formatter * chebee7i -- Python traceback lexer improvements * Hiram Chirino -- Scaml and Jade lexers @@ -61,13 +62,16 @@ Other contributors, listed alphabetically, are: * Carlos Galdino -- Elixir and Elixir Console lexers * Michael Galloy -- IDL lexer * Naveen Garg -- Autohotkey lexer +* Simon Garnotel -- FreeFem++ lexer * Laurent Gautier -- R/S lexer * Alex Gaynor -- PyPy log lexer * Richard Gerkin -- Igor Pro lexer * Alain Gilbert -- TypeScript lexer * Alex Gilding -- BlitzBasic lexer +* GitHub, Inc -- DASM16, Augeas, TOML, and Slash lexers * Bertrand Goetzmann -- Groovy lexer * Krzysiek Goj -- Scala lexer +* Rostyslav Golda -- FloScript lexer * Andrey Golovizin -- BibTeX lexers * Matt Good -- Genshi, Cheetah lexers * Michał Górny -- vim modeline support @@ -101,6 +105,7 @@ Other contributors, listed alphabetically, are: * Dennis Kaarsemaker -- sources.list lexer * Dmitri Kabak -- Inferno Limbo lexer * Igor Kalnitsky -- vhdl lexer +* Colin Kennedy - USD lexer * Alexander Kit -- MaskJS lexer * Pekka Klärck -- Robot Framework lexer * Gerwin Klein -- Isabelle lexer @@ -222,8 +227,5 @@ Other contributors, listed alphabetically, are: * Alex Zimin -- Nemerle lexer * Rob Zimmerman -- Kal lexer * Vincent Zurczak -- Roboconf lexer -* Rostyslav Golda -- FloScript lexer -* GitHub, Inc -- DASM16, Augeas, TOML, and Slash lexers -* Simon Garnotel -- FreeFem++ lexer Many thanks for all contributions! |