Normalize conflict related messages.

[bison.git] / THANKS

diff --git a/THANKS b/THANKS
index e74019f0aaf9a452d6e39d953b8bf9c5020abb95..77b7c53a7e8fb7c4e4f51a1824b41714ed842c8a 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -2,29 +2,57 @@ Bison was originally written by Robert Corbett.  It would not be what
 it is today without the invaluable help of these people:
 
 Airy Andre              Airy.Andre@edf.fr
-Akim Demaille           akim@epita.fr
+Akim Demaille           akim@freefriends.org
 Albert Chin-A-Young     china@thewrittenword.com
 Alexander Belopolsky    alexb@rentec.com
+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
 Dick Streefland                dick.streefland@altium.nl
+Enrico Scholz           enrico.scholz@informatik.tu-chemnitz.de
+Evgeny Stambulchik     fnevgeny@plasma-gate.weizmann.ac.il
 Fabrice Bauzac          noon@cote-dazur.com
+Florian Krohm           florian@edamail.fishkill.ibm.com
+H. Merijn Brand         h.m.brand@hccnet.nl
 Hans Aberg              haberg@matematik.su.se
 Jesse Thilo             jthilo@gnu.org
 Jim Meyering            meyering@gnu.org
 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
+Nelson H. F. Beebe      beebe@math.utah.edu
+Nicolas Burrus          nicolas.burrus@epita.fr
+Nicolas Tisserand       nicolas.tisserand@epita.fr
 Noah Friedman           friedman@gnu.org
 Pascal Bart             pascal.bart@epita.fr
 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
+Tim Josling             tej@melbpc.org.au
+Tom Lane                tgl@sss.pgh.pa.us
+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.