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

author Daniel R. Grayson <dan@math.uiuc.edu>

Mon, 19 Oct 2015 20:08:54 +0000 (16:08 -0400)

committer Daniel R. Grayson <dan@math.uiuc.edu>

Mon, 19 Oct 2015 20:08:54 +0000 (16:08 -0400)
author Daniel R. Grayson <dan@math.uiuc.edu>
Mon, 19 Oct 2015 20:08:54 +0000 (16:08 -0400)
committer Daniel R. Grayson <dan@math.uiuc.edu>
Mon, 19 Oct 2015 20:08:54 +0000 (16:08 -0400)
diff --cc .gitignore

index fe6f2d80d778f9f1830cf3aacfedf131ad5b0fda,71033dbcc3c6e5878a780f568bfe3ad528cc1e87..8747b842a1ddf499449f478eb32f559bc8fd71c1
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -6,6 -5,5 +6,8 @@@ TAG
   dist/
   Exp/
   cubical
+ +Makefile.bak
+ +Main
+ +.depends-made
+ .cabal-sandbox
+ cabal.sandbox.config
author	Daniel R. Grayson <dan@math.uiuc.edu>
	Mon, 19 Oct 2015 20:08:54 +0000 (16:08 -0400)
committer	Daniel R. Grayson <dan@math.uiuc.edu>
	Mon, 19 Oct 2015 20:08:54 +0000 (16:08 -0400)