summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-08-23 14:55:00 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-08-23 14:55:00 +0000
commit6f7f7f8520ced2ca61560b0b54e69a745951a61a (patch)
tree5d4c1d5d977cbc87ada17bccf48d7a2f413c6e42
parentae9e1829d66a6c145d96eae47b7b387822567e4d (diff)
downloadATCD-6f7f7f8520ced2ca61560b0b54e69a745951a61a.tar.gz
Daniel Manfis <dany_100@yahoo.com>
-rw-r--r--THANKS7
1 files changed, 4 insertions, 3 deletions
diff --git a/THANKS b/THANKS
index 5ebd961adb7..e933a0343fb 100644
--- a/THANKS
+++ b/THANKS
@@ -1317,10 +1317,11 @@ Eamonn Saunders <Esaunders@softricity.com>
Yev Omenzel <omenzel@yahoo.com>
John E Hein <jhein@timing.com>
Tino Schwarze <tino.schwarze@informatik.tu-chemnitz.de>
-<<<<<<< THANKS
+Don Hinton <dhinton@swan.fr>
+Gergely Timar <timarok@elender.hu>
+Peter Phillips <pphillip@opentext.com>
Kuznesov Yury <yury@newst.net>
-=======
->>>>>>> 4.654
+Daniel Manfis <dany_100@yahoo.com>
I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson in the early 1990's. Paul devised the recursive Makefile