Skip to content

Commit

Permalink
Merge branch 'release-2.0.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffamstutz committed Jan 18, 2020
2 parents e041b98 + 95d2b5a commit e03ad2e
Show file tree
Hide file tree
Showing 1,404 changed files with 65,982 additions and 178,258 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*#
bin
*.user*
build*
./build*
*.sw?
tags
.ycm_extra_conf.pyc
Expand All @@ -22,9 +22,9 @@ ispc
readme.pdf
!/modules
/modules/*
!/modules/mpi
!/modules/pluggableGeometryExample
!/modules/simdGeometryExample
!/modules/denoiser
*.vim
.idea/
premake.local.*
Expand Down
Loading

0 comments on commit e03ad2e

Please sign in to comment.