Merge branch 'patch-1' of git://github.com/cooperra/antlr4 into cooperra-patch-1

# Conflicts:
#	contributors.txt
This commit is contained in:
parrt 2016-01-28 10:47:57 -08:00
parent 5299d436aa
commit 3a733af5f7
1 changed files with 2 additions and 2 deletions

View File

@ -83,6 +83,6 @@ YYYY/MM/DD, github id, Full name, email
2015/10/12, KvanTTT, Ivan Kochurkin, ivan.kochurkin@gmail.com
2015/10/21, martin-probst, Martin Probst, martin-probst@web.de
2015/10/21, hkff, Walid Benghabrit, walid.benghabrit@mines-nantes.fr
2015/11/25, abego, Udo Borkowski, ub@abego.org
2015/12/17, sebadur, Sebastian Badur, sebadur@users.noreply.github.com2015/06/29, jvanzyl, Jason van Zyl, jason@takari.io
2015/11/12, cooperra, Robbie Cooper, cooperra@users.noreply.github.com
2015/11/25, abego, Udo Borkowski, ub@abego.org
2015/12/17, sebadur, Sebastian Badur, sebadur@users.noreply.github.com