summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorJeffrey B. Arnold <jeffrey.arnold@gmail.com>2012-09-02 06:18:24 -0400
committerJeffrey B. Arnold <jeffrey.arnold@gmail.com>2012-09-02 06:18:24 -0400
commit0c363d7084ebd5b246c6d11e3494a3e481e91b2c (patch)
treedb247976979fda99925531d0fc48930bc49eb3bf /AUTHORS
parentc216140e347feefc7ef14776fd2b0fe32740756c (diff)
parent7c371dd21127e55cbbee5daf955a0974115fc65a (diff)
downloadpygments-0c363d7084ebd5b246c6d11e3494a3e481e91b2c.tar.gz
resolved conflict
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS1
1 files changed, 1 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 03311ea2..49cf4d67 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -44,6 +44,7 @@ Other contributors, listed alphabetically, are:
* Matthew Harrison -- SVG formatter
* Steven Hazel -- Tcl lexer
* Aslak Hellesøy -- Gherkin lexer
+* Greg Hendershott -- Racket lexer
* Jordi Gutiérrez Hermoso -- Octave lexer
* David Hess, Fish Software, Inc. -- Objective-J lexer
* Varun Hiremath -- Debian control lexer