23:48:2823:48:28<p>- Changes -------------------------------------------------------------</p>
23:48:2823:48:28<pre>
23:48:28The branch null has been updated.
23:48:28 from 5144898a565d9d8aaf7556eaee8c4c2e6ebacc4a (commit)
23:48:28</pre>
23:48:2823:48:28<p>- Log -----------------------------------------------------------------</p>
23:48:2823:48:28<pre>
23:48:28commit 5144898a565d9d8aaf7556eaee8c4c2e6ebacc4a
23:48:28Merge: 12f115660 f1d2c44f8
23:48:28Author: Peter A. Buhr <pabuhr@uwaterloo.ca>
23:48:2823:48:28 Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc
23:48:2823:48:28commit 12f115660af199443846e0eaf25044dc38abc565
23:48:28Author: Peter A. Buhr <pabuhr@uwaterloo.ca>
23:48:2823:48:28 simplify grammar in a few places
23:48:2823:48:28commit f1d2c44f82e6775bcf0106a967ac2ec6a5138b4a
23:48:28Author: Andrew Beach <ajbeach@uwaterloo.ca>
23:48:2823:48:28 Updates to the module proposal. Just an assortment of clean-up and things I missed.
23:48:2823:48:28commit 2ab31fd455e00a42c1e4c9e02584f49b0fc58707
23:48:28Author: Peter A. Buhr <pabuhr@uwaterloo.ca>
23:48:2823:48:28 parse tuple-element declarations but unimplemented
23:48:28</pre>
23:48:2823:48:28<p>-----------------------------------------------------------------------</p>
23:48:28<pre>
23:48:28Summary of changes:
23:48:28doc/proposals/modules.md | 22 <span style="color: #00AA00;">+++++++++++++</span><span style="color: #AA0000;">-------</span>
23:48:28 src/Parser/parser.yy | 53 <span style="color: #00AA00;">++++++++++++++++++++++++</span><span style="color: #AA0000;">------------------------</span>
23:48:28 2 files changed, 41 insertions(+), 34 deletions(-)
23:48:28</pre>
23:48:28