diff options
author | Manoj Srivastava <srivasta@debian.org> | 2008-05-30 14:15:43 -0500 |
---|---|---|
committer | Manoj Srivastava <srivasta@debian.org> | 2008-05-30 14:15:43 -0500 |
commit | d902bed25e446508e9dcbe84001f738e77dd1979 (patch) | |
tree | 378d1e978b67c2c78904a81b454d303def969a97 /mcon/U/d_drem.U | |
parent | 13da8069e56806306f6b42e2af5f03e89a835083 (diff) | |
parent | 6ed168ff814db8f9bcaad6f2e218fb2bbacbdb1c (diff) |
Merge branch 'upstream'
Conflicts:
jmake/files/Jmake.rules
mcon/U/Chk_MANI.U
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
Diffstat (limited to 'mcon/U/d_drem.U')
-rw-r--r-- | mcon/U/d_drem.U | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mcon/U/d_drem.U b/mcon/U/d_drem.U index 4e86499..4da2414 100644 --- a/mcon/U/d_drem.U +++ b/mcon/U/d_drem.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_drem.U,v 3.0.1.1 1994/10/29 16:12:14 ram Exp $ +?RCS: $Id$ ?RCS: -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: Original Author: Andy Dougherty <doughera@lafcol.lafayette.edu> ?RCS: |