diff options
| author | Manoj Srivastava <srivasta@golden-gryphon.com> | 2014-04-27 18:05:39 -0700 |
|---|---|---|
| committer | Manoj Srivastava <srivasta@golden-gryphon.com> | 2014-04-27 18:05:39 -0700 |
| commit | 7d4c02d5c9108aa413fbb0ffa1dc8a39bc5f54a1 (patch) | |
| tree | 2abb9ad01d397bc1e208f57f528c1ec529761392 /mcon/U/Config_h.U | |
| parent | 5c913c35c09a82eead2c07534baa709a5dead3e7 (diff) | |
| parent | 8f5e5726134ce5b4bd436b16f367796d851df553 (diff) | |
Merge branch 'upstream'
Signed-off-by: Manoj Srivastava <srivasta@golden-gryphon.com>
Conflicts:
jmake/jmake.man
Diffstat (limited to 'mcon/U/Config_h.U')
| -rw-r--r-- | mcon/U/Config_h.U | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mcon/U/Config_h.U b/mcon/U/Config_h.U index 8bd4bf0..71cd6c7 100644 --- a/mcon/U/Config_h.U +++ b/mcon/U/Config_h.U @@ -1,11 +1,11 @@ -?RCS: $Id: Config_h.U 1 2006-08-24 12:32:52Z rmanfredi $ +?RCS: $Id: Config_h.U 167 2013-05-08 17:58:00Z rmanfredi $ ?RCS: ?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: -?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: ?RCS: $Log: Config_h.U,v $ @@ -98,7 +98,7 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un * that running config_h.SH again will wipe out any changes you've made. * For a more permanent change edit $CONFIG_SH and rerun config_h.SH. * - * \$Id: Config_h.U 1 2006-08-24 12:32:52Z rmanfredi $ + * \$Id: Config_h.U 167 2013-05-08 17:58:00Z rmanfredi $ */ /* |