Merge branch 'master' into pucked.
authorMatt Birkholz <matt@birchwood-abbey.net>
Fri, 13 Dec 2019 04:43:45 +0000 (21:43 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Fri, 13 Dec 2019 04:43:45 +0000 (21:43 -0700)
1  2 
doc/configure.ac
doc/ref-manual/scheme.texinfo
src/edwin/edtfrm.scm
src/edwin/edwin.pkg
src/edwin/intmod.scm
src/edwin/tterm.scm
src/runtime/mit-macros.scm
src/runtime/runtime.pkg
tests/check.scm

index eed1a5e7526bc652e85b848a7a04564607bb3d4e,d267558db1a80e493d6d3fb16509b2e04d778119..5d57477e10ba5d80467402d0fe146bb1914c3c0c
@@@ -1,9 -1,9 +1,9 @@@
  dnl Process this file with autoconf to produce a configure script.
  
 -AC_INIT([MIT/GNU Scheme documentation],
 -      [10.1.90],
 -      [bug-mit-scheme@gnu.org],
 -      [mit-scheme-doc])
 +AC_INIT([MIT/GNU Scheme Pucked documentation],
-       [10.1.12],
++      [10.1.14],
 +      [matt@birchwood-abbey.net],
 +      [mit-scheme-pucked-doc])
  AC_CONFIG_SRCDIR([ref-manual/scheme.texinfo])
  
  AC_COPYRIGHT(
index bffa223fb49b0bfcaf34e56bb13988130075d821,2630d6ed04e79a5a147ca75bfa46d1427a3dd919..4707773c84edd372e0f82cf3dfa07fdeace01d78
@@@ -1,11 -1,10 +1,11 @@@
  \input texinfo @c -*-texinfo-*-
  @comment %**start of header
 -@setfilename mit-scheme-ref
 +@setfilename reference
 +@comment From automake's version.texi someday:
  @set EDITION 1.106
 -@set VERSION 10.1.90
 -@set UPDATED 2019-12-04
 -@settitle MIT/GNU Scheme @value{VERSION}
 +@set UPDATED 19 May 2018
- @set SCMVERS 10.1.12
++@set SCMVERS 10.1.14
 +@settitle MIT/GNU Scheme Pucked Reference Manual
  @comment %**end of header
  @setchapternewpage odd
  @finalout
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc tests/check.scm
Simple merge