manual merge of ben's pull request

This commit is contained in:
P.M. Sutter 2014-06-04 00:11:05 -04:00
parent 42a934e0f1
commit 276a551914
2 changed files with 3 additions and 1 deletions

2
.gitignore vendored
View file

@ -4,6 +4,8 @@
.mydepend
./pipeline/miscTools/*.out
output_*
pipeline/ramses_simulation.py
external/libsdf/libsw/Malloc.c
c_tools/hod/hod
c_tools/zobov2/jozov2/jozov2