From cf208d020339d2c0e755d6de1a5b312328908a4e Mon Sep 17 00:00:00 2001
From: germeier <germeier>
Date: Thu, 19 Sep 2002 21:25:07 +0000
Subject: fixed handling of an abort fixed buggy define

---
 ChangeLog | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 77d77cb..8fc9539 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-19  Markus Germeier  <mager@tzi.de>
+
+	* mpiosh/callback.c (mpiosh_cmd_dump, mpiosh_cmd_mget) 
+	(mpiosh_cmd_mdel, mpiosh_cmd_mput): fixed handling of an abort
+	* libmpio/mpio.c (MPIO_ERR_RETURN): fixed buggy define
+
 2002-09-19  Andreas Buesching  <crunchy@tzi.de>
 
 	* mpiosh/mpiosh.c (mpiosh_command_regex_fix): hopefully fixed a
@@ -11,6 +17,7 @@
 	  (mpio_file_get, mpio_file_put, mpio_file_del): using error
 	  handling functions
 
+>>>>>>> 1.40
 2002-09-19  Markus Germeier  <mager@tzi.de>
 
 	* libmpio/mpio.c (mpio_init_internal): 
-- 
cgit v1.2.3