Brian Huffman b3d2851923 Merge branch 'master' into literal-class ... # Conflicts: # src/Cryptol/TypeCheck/Kind.hs # src/Cryptol/TypeCheck/Solve.hs		2018-06-13 11:41:35 -07:00
..
Cryptol.cry	Merge branch 'master' into literal-class	2018-06-13 11:41:35 -07:00
CryptolTC.z3	Switch to infix syntax for blocks and padding operators.	2017-09-28 10:26:31 -07:00