Changeset d800676 for doc/theses/colby_parsons_MMAth/thesis.tex

Timestamp:

Mar 23, 2023, 12:18:39 PM (13 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

c94b1f0

Parents:

1afd9ccb (diff), 18ea270 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• doc/theses/colby_parsons_MMAth/thesis.tex (modified) (3 diffs)

doc/theses/colby_parsons_MMAth/thesis.tex

@@ -23 +23 @@
 \usepackage{calc}
 \usepackage{xspace}
-\usepackage[labelformat=simple]{subfig}
-\renewcommand{\thesubfigure}{(\alph{subfigure})}
+% \usepackage[labelformat=simple]{subfig}
+% \renewcommand{\thesubfigure}{(\alph{subfigure})}
+\usepackage{subcaption}
+% \usepackage{subfigure}
 \usepackage{graphicx}
 \usepackage{tabularx}
@@ -102 +104 @@
 % FRONT MATERIAL
 %----------------------------------------------------------------------
-% \input{frontpgs}
+\input{frontpgs}
 
 %----------------------------------------------------------------------
@@ -111 +113 @@
 
 \input{CFA_intro}
+
+\input{CFA_concurrency}
+
+\input{mutex_stmt}
 
 \input{actors}