summaryrefslogtreecommitdiff
path: root/THANKS
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2001-08-22 20:04:13 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2001-08-22 20:04:13 +0000
commit4dc761584c422dcc877b80ec68cd698328154896 (patch)
tree2b5df236a75b092d228a6946ab41e09561c45ef6 /THANKS
parent5f5bf0420bdc4595ba8b06b1857f826d3e4d49f8 (diff)
downloadATCD-4dc761584c422dcc877b80ec68cd698328154896.tar.gz
ChangeLogTag:Wed Aug 22 12:04:04 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
Diffstat (limited to 'THANKS')
-rw-r--r--THANKS6
1 files changed, 4 insertions, 2 deletions
diff --git a/THANKS b/THANKS
index 7a95e425d6f..9d7fe6ad5c5 100644
--- a/THANKS
+++ b/THANKS
@@ -1317,8 +1317,10 @@ Eamonn Saunders <Esaunders@softricity.com>
Yev Omenzel <omenzel@yahoo.com>
John E Hein <jhein@timing.com>
Tino Schwarze <tino.schwarze@informatik.tu-chemnitz.de>
-Don Hinton <dhinton@swan.fr>
-Gergely Timar <timarok@elender.hu>
+<<<<<<< THANKS
+Kuznesov Yury <yury@newst.net>
+=======
+>>>>>>> 4.654
I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson in the early 1990's. Paul devised the recursive Makefile