Timothy Clem 13b85ac828 Merge remote-tracking branch 'origin/master' into ruby-assignment-ftw		2017-09-19 11:31:46 -07:00
..
JSON.hs	Rename the TermF constructor to In.	2017-09-11 15:36:23 -04:00
Patch.hs	Give Diff a pair of type parameters for the annotation types.	2017-09-14 09:41:52 -04:00
SExpression.hs	Give Diff a pair of type parameters for the annotation types.	2017-09-14 09:41:52 -04:00
TOC.hs	Merge remote-tracking branch 'origin/master' into ruby-assignment-ftw	2017-09-19 11:31:46 -07:00