Commit Graph

3 Commits

Author SHA1 Message Date
430e7e962f Merge branch 'master' into dielectric-updates
# Conflicts:
#	src/DIELECTRIC/Install.sh
#	src/DIELECTRIC/pppm_disp_dielectric.cpp
#	src/DIELECTRIC/pppm_disp_dielectric.h
2021-07-03 15:27:57 -04:00
878795e64a bulk rename of remaining USER- packages 2021-06-29 20:12:59 -04:00
4342987043 rename example folders 2021-06-29 11:23:47 -04:00