Merge branch 'testUniv'
authorAnders Mörtberg <andersmortberg@gmail.com>
Thu, 31 Dec 2015 07:24:29 +0000 (08:24 +0100)
committerAnders Mörtberg <andersmortberg@gmail.com>
Thu, 31 Dec 2015 07:24:29 +0000 (08:24 +0100)
commitf2a56ccbcdb73e74c756179aa65f0d0524d3bab4
treec4c4a5b0b42ac819d7a349c1ca14b8db5fef3703
parentdfbefc6282efb96cf3ec0a51ff91c03ee893483c
parent3d43f42aec55f0b8b423d12f28abde0bd9b4dae4
Merge branch 'testUniv'

# Conflicts:
# examples/testContr.ctt
# examples/testEquiv.ctt
examples/testContr.ctt
examples/testEquiv.ctt