Merge branch 'master' of https://github.com/mortberg/cubicaltt
authorcoquand <coquand@chalmers.se>
Fri, 3 Jul 2015 11:16:12 +0000 (13:16 +0200)
committercoquand <coquand@chalmers.se>
Fri, 3 Jul 2015 11:16:12 +0000 (13:16 +0200)
commitd9a32930eff979e763bf85a635d0e47025c343c6
tree9538a4f569ec3f1e30bcc3dd54dba01816990714
parent9255242243e9c0df91bdee273afe338b4e4cf930
parent19ab11cc9b2ffe5b62d72806b3ee023fb84b4c55
Merge branch 'master' of https://github.com/mortberg/cubicaltt

Conflicts:
examples/univalence.ctt
examples/univalence.ctt