Skip to content
Snippets Groups Projects
Commit 7cc98f8e authored by Omar Awile's avatar Omar Awile
Browse files

Merge branch 'feature/build' into feature/threads

Conflicts:
	src/mg/ppm_mg_init.f
	src/mg/ppm_mg_smooth_coarse.f
	src/mg/ppm_mg_smooth_fine.f
	src/mg/ppm_mg_solv.f
	src/ppm_define.h
	src/ppm_module_data_mg.f
parents 9023cbfd bf62bcc6
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment