|author||Manoj Srivastava <firstname.lastname@example.org>||2014-04-27 18:05:39 -0700|
|committer||Manoj Srivastava <email@example.com>||2014-04-27 18:05:39 -0700|
Merge branch 'upstream'
Signed-off-by: Manoj Srivastava <firstname.lastname@example.org> Conflicts: jmake/jmake.man
Diffstat (limited to 'mcon/U/d_portable.U')
1 files changed, 3 insertions, 3 deletions
diff --git a/mcon/U/d_portable.U b/mcon/U/d_portable.U
index d547138..dc1aa63 100644
@@ -1,11 +1,11 @@
-?RCS: $Id: d_portable.U 1 2006-08-24 12:32:52Z rmanfredi $
+?RCS: $Id: d_portable.U 167 2013-05-08 17:58:00Z rmanfredi $
?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
-?RCS: You may redistribute only under the terms of the Artistic Licence,
+?RCS: You may redistribute only under the terms of the Artistic License,
?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: that same Artistic License; a copy of which may be found at the root
?RCS: of the source tree for dist 4.0.
?RCS: $Log: d_portable.U,v $