Browse Source

Merge branch 'jwhitlock/contrib'

Conflicts:
	CONTRIBUTORS.txt
Ask Solem 10 years ago
parent
commit
68496a9047
2 changed files with 2 additions and 0 deletions
  1. 1 0
      CONTRIBUTORS.txt
  2. 1 0
      docs/AUTHORS.txt

+ 1 - 0
CONTRIBUTORS.txt

@@ -167,3 +167,4 @@ Ross Deane, 2014/07/11
 Tadej Janež, 2014/08/08
 Tadej Janež, 2014/08/08
 Akexander Koshelev, 2014/08/19
 Akexander Koshelev, 2014/08/19
 Davide Quarta, 2014/08/19
 Davide Quarta, 2014/08/19
+John Whitlock, 2014/08/19

+ 1 - 0
docs/AUTHORS.txt

@@ -69,6 +69,7 @@ Jeff Terrace <jterrace@gmail.com>
 Jerzy Kozera <jerzy.kozera@gmail.com>
 Jerzy Kozera <jerzy.kozera@gmail.com>
 Jesper Noehr <jesper@noehr.org>
 Jesper Noehr <jesper@noehr.org>
 John Watson <johnw@mahalo.com>
 John Watson <johnw@mahalo.com>
+John Whitlock <john-whitlock@ieee.org>
 Jonas Haag <jonas@lophus.org>
 Jonas Haag <jonas@lophus.org>
 Jonas Obrist <me@ojii.ch>
 Jonas Obrist <me@ojii.ch>
 Jonatan Heyman <jonatan@heyman.info>
 Jonatan Heyman <jonatan@heyman.info>