Skip to content

Commit

Permalink
Merge branch 'master' into firedrake
Browse files Browse the repository at this point in the history
  • Loading branch information
wence- committed Feb 18, 2020
2 parents 4972004 + bac983c commit 0d9a514
Show file tree
Hide file tree
Showing 1,349 changed files with 49,031 additions and 14,755 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*.pvt[ksu]
*.h5m
.*_license
*.mypy_cache
unix/*
unix-opt/*
unix-gcov/*
Expand Down
Loading

0 comments on commit 0d9a514

Please sign in to comment.