aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog3
1 files changed, 0 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index bc218c3..df96230 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,19 +4,16 @@
functionality at the moment
(commands): removed completion for mpio files on the put command
-<<<<<<< ChangeLog
2002-10-14 Andreas Buesching <crunchy@tzi.de>
* mpiosh/global.c (commands): reactivated switch command without
any functionality at the moment
-=======
2002-10-18 Markus Germeier <mager@tzi.de>
* libmpio/directory.c (mpio_dentry_get_real):
another fix for the 8.3 handling needed for the config file
->>>>>>> 1.65
2002-10-13 Markus Germeier <mager@tzi.de>
* mpiosh/callback.c (mpiosh_cmd_dump): fixed compile and