--- deliantra/server/AUTHORS	2007/03/05 19:10:49	1.2
+++ deliantra/server/AUTHORS	2007/03/05 19:54:10	1.3
@@ -8,6 +8,57 @@
 Original Crossfire:
 
 Source:
+<<<<<<< AUTHORS
+  crossfire: (try "crossfire -v")
+    Presently maintained by Marc Lehmann (schmorp@schmorp.de)
+    Original code by Frank Tore Johansen (frankj@ifi.uio.no)
+    _Lots_ of additions, improvements, bugfixes, patches, etc, by:
+      kjetilho@ifi.uio.no (Kjetil Torgrim Homme)
+      tvangod@ecst.csuchico.edu (Tyler Van Gorder)
+      elmroth@cd.chalmers.se  (Tony Elmroth)
+      dougal.scott@fcit.monash.edu.au (Dougal Scott)
+      wchuang@athena.mit.edu  (William)
+      ftww@cs.su.oz.au (Geoff Bailey)
+      jorgens@flipper.pvv.unit.no (Kjetil Wiekhorst Jxrgensen)
+      c.blackwood@rdt.monash.edu.au (Cameron Blackwood)
+      jtraub@dragoncat.net  (Joseph L. Traub)
+      rgg@aaii.oz.au (Rupert G. Goldie)
+      eanders@cs.berkeley.edu (Eric A. Anderson)
+      eneq@Prag.DoCS.UU.SE (Rickard Eneqvist)
+      Jarkko.Sonninen@lut.fi (Jarkko Sonninen)
+      kholland@sunlab.cit.cornell.edu (Karl Holland)
+      vick@bern.docs.uu.se (Mikael Lundgren)
+      mol@meryl.csd.uu.se (Mikael Olsson)
+      Tero.Haatanen@tel.vtt.fi (Tero Haatanen)
+      ylitalo@student.docs.uu.se (Lasse Ylitalo)
+      anipa@guru.magic.fi (Niilo Neuvo)
+      mta@modeemi.cs.tut.fi (Markku J{rvinen)
+      meunier@inf.enst.fr (Sylvain Meunier)
+      jfosback@darmok.uoregon.edu (Jason Fosback)
+      cedman@capitalist.princeton.edu (Carl Edman)
+      henrich@crh.cl.msu.edu (Charles Henrich)
+      schmid@fb3-s7.math.tu-berlin.de (Gregor Schmid)
+      quinet@montefiore.ulg.ac.be (Raphael Quinet)
+      jam@modeemi.cs.tut.fi (Jari Vanhala)
+      kivinen@joker.cs.hut.fi (Tero Kivinen)
+      peterm@soda.berkeley.edu (Peter Mardahl)
+      matt@cs.odu.edu (Matthew Zeher)
+      srt@sun-dimas.aero.org (Scott R. Turner)
+      smurf@soda.berkeley.edu (Scott MacFiggen)
+      tpeland@utu.fi (Tero Jyri Michael Pelander)
+      raytrace@soda.berkeley.edu (Rachel Yotter)
+      huma@netcom.com (Ben Fennema)
+      njw@cs.city.ac.uk (Nick Williams)
+      Wacren@Gin.ObsPM.Fr (Laurent Wacrenier)
+      thomas@astro.psu.edu (Brian Thomas)
+      jsm@axon.ksc.nasa.gov (John Steven Moerk)
+      swedel@tymnet.com (Scott Wedel)
+      s-nisita@urdr.ics.es.osaka-u.ac.jp (Nishita Seikoh)
+      stieber@informatik.tu-muenchen.de (Christian Stieber)
+
+  xbmtobdf.c and shstr.C:
+    Kjetil Torgrim Homme
+=======
  Original code by Frank Tore Johansen (frankj@ifi.uio.no)
  _Lots_ of additions, improvements, bugfixes, patches, etc, by:
    kjetilho@ifi.uio.no (Kjetil Torgrim Homme)
@@ -52,6 +103,7 @@
    swedel@tymnet.com (Scott Wedel)
    s-nisita@urdr.ics.es.osaka-u.ac.jp (Nishita Seikoh)
    stieber@informatik.tu-muenchen.de (Christian Stieber)
+>>>>>>> 1.2
 
 Documentation and spoilers:
   General documentation on playing and getting started: