From: Daniel R. Grayson <dan@math.uiuc.edu>
Date: Mon, 19 Oct 2015 20:08:54 +0000 (-0400)
Subject: Merge branch 'master' of github.com:mortberg/cubicaltt into improve-Makefile
X-Git-Url: https://git.ak3n.com/?a=commitdiff_plain;h=f24b1a16c5b4ad3086ac8aa26c9f7c34bc27f8c6;p=cubicaltt.git

Merge branch 'master' of github.com:mortberg/cubicaltt into improve-Makefile
---

f24b1a16c5b4ad3086ac8aa26c9f7c34bc27f8c6
diff --cc .gitignore
index fe6f2d8,71033db..8747b84
--- a/.gitignore
+++ b/.gitignore
@@@ -6,6 -5,5 +6,8 @@@ TAG
  dist/
  Exp/
  cubical
 +Makefile.bak
 +Main
 +.depends-made
+ .cabal-sandbox
+ cabal.sandbox.config