Merge branch 'master' of github.com:Drezil/hgraph

Conflicts: .gitignore
2014-04-22 13:23:21 +02:00
parent 4ffaa00148 7d5e1661db
commit 4d75e8de7c
3 changed files with 674 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,7 +5,6 @@
 *.lkshf

 /.dist-buildwrapper
-dist/setup-config
 .project*
 *autogen*
 dist/build/
@ -19,3 +18,12 @@ doc/ausarbeitung/hgraph_doc.out
 doc/ausarbeitung/hgraph_doc.run.xml
 doc/ausarbeitung/hgraph_doc.synctex.gz
 doc/ausarbeitung/hgraph_doc.toc
+dist
+cabal-dev
+*.chi
+*.chs.h
+.virtualenv
+.hsenv
+.cabal-sandbox/
+cabal.sandbox.config
+cabal.config