Normalize conflict related messages.

[bison.git] / THANKS

diff --git a/THANKS b/THANKS
index ad55a59a52b9c6c1e6d3435c1ef402334d8fe2d6..77b7c53a7e8fb7c4e4f51a1824b41714ed842c8a 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -9,6 +9,7 @@ Andreas Schwab          schwab@suse.de
 Arnold Robbins         arnold@skeeve.com
 Benoit Perrot           benoit.perrot@epita.fr
 Bruce Lilly             blilly@erols.com
+Cris Bailiff            c.bailiff+bison@awayweb.com
 Cris van Pelt           cris@amf03054.office.wxs.nl
 Daniel Hagerty          hag@gnu.org
 David J. MacKenzie      djm@gnu.org
@@ -25,7 +26,9 @@ Juan Manuel Guerrero    ST001906@HRZ1.HRZ.TU-Darmstadt.De
 Kees Zeelenberg         kzlg@users.sourceforge.net
 Keith Browne            kbrowne@legato.com
 Laurent Mascherpa       laurent.mascherpa@epita.fr
+Magnus Fromreide        magfr@lysator.liu.se
 Marc Autret             autret_m@epita.fr
+Matt Kraai              kraai@alumni.cmu.edu
 Michael Hayes           m.hayes@elec.canterbury.ac.nz
 Mike Castle             dalgoda@ix.netcom.com
 Neil Booth              NeilB@earthling.net
@@ -38,6 +41,8 @@ Paul Eggert             eggert@twinsun.com
 Per Allansson           per@appgate.com
 Peter Hámorský          hamo@upjs.sk
 Piotr Gackiewicz        gacek@intertel.com.pl
+R Blake                 blakers@mac.com
+Raja R Harinath         harinath@cs.umn.edu
 Richard Stallman        rms@gnu.org
 Robert Anisko           anisko_r@epita.fr
 Shura                   debil_urod@ngs.ru
@@ -47,6 +52,7 @@ Tom Tromey              tromey@cygnus.com
 Wayne Green             wayne@infosavvy.com
 Wolfram Wagner          ww@mpi-sb.mpg.de
 Wwp                     subscript@free.fr
+Zack Weinberg           zack@codesourcery.com
 
 Many people are not named here because we lost track of them.  We
 thank them!  Please, help us keeping this list up to date.