git.ak3n.com - cubicaltt.git/commitdiff

projects / cubicaltt.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9255242 19ab11c)

author	coquand <coquand@chalmers.se>
	Fri, 3 Jul 2015 11:16:12 +0000 (13:16 +0200)
committer	coquand <coquand@chalmers.se>
	Fri, 3 Jul 2015 11:16:12 +0000 (13:16 +0200)

Conflicts:
examples/univalence.ctt

		1	2
examples/univalence.ctt	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

My fork of cubicaltt with web interface using Reflex.