From 08f6a275128556cd7c47ae8f87002a1a071412be Mon Sep 17 00:00:00 2001 From: Nick Hamilton Date: Thu, 11 Jul 2019 09:42:03 +1000 Subject: [PATCH 1/2] Move wibble code below arbitrary code in example. --- introduction.tex | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/introduction.tex b/introduction.tex index 6d4eec2..b1ab764 100644 --- a/introduction.tex +++ b/introduction.tex @@ -45,10 +45,10 @@ return (a + b) * 2; } -int r = `wibble(x, y);` - /* arbitrary code */ +int r = `wibble(x, y);` + blobble(`r`, `r`); \end{lstlisting} \end{block} @@ -68,10 +68,10 @@ return (a + b) * 2; } -int r = wibble(x, y); - /* arbitrary code */ +int r = wibble(x, y); + blobble(r, r); \end{lstlisting} \end{block} @@ -112,10 +112,10 @@ return (a + b) * 2; } -int r = `pibble(x, y);` - /* arbitrary code */ +int r = `pibble(x, y);` + globble(`r`, `r`); \end{lstlisting} \end{block} From 613f4a4b484bc067982dc7a0f05c52de5cb4d77b Mon Sep 17 00:00:00 2001 From: Nick Hamilton Date: Mon, 15 Jul 2019 11:21:55 +1000 Subject: [PATCH 2/2] Added introduction/housekeeping to slides. --- fp-introduction.tex | 2 ++ housekeeping.tex | 13 +++++++++++++ who-we-are.tex | 10 ++++++++++ 3 files changed, 25 insertions(+) create mode 100644 housekeeping.tex create mode 100644 who-we-are.tex diff --git a/fp-introduction.tex b/fp-introduction.tex index a7f8a6d..29feb0a 100644 --- a/fp-introduction.tex +++ b/fp-introduction.tex @@ -227,8 +227,10 @@ \begin{document} \input{title} +\input{who-we-are} \input{qfpl} \input{me} +\input{housekeeping} \input{introduction} \input{consequences} \input{example} diff --git a/housekeeping.tex b/housekeeping.tex new file mode 100644 index 0000000..9be9c99 --- /dev/null +++ b/housekeeping.tex @@ -0,0 +1,13 @@ +\begin{frame} + \begin{block}\textbf{Housekeeping} +\end{block} +\begin{center} +\begin{itemize} + \item Fire exits + \item Bathrooms + \item Building access + \item WiFi + \item Contacts: IRC / email / phone +\end{itemize} +\end{center} +\end{frame} diff --git a/who-we-are.tex b/who-we-are.tex new file mode 100644 index 0000000..4c25100 --- /dev/null +++ b/who-we-are.tex @@ -0,0 +1,10 @@ +\begin{frame} + \begin{block}\textbf{CSIRO's Data61's QFPL} +\end{block} +\begin{center} +\begin{itemize} + \item QFPL + \item Data61 +\end{itemize} +\end{center} +\end{frame}