Commit 05603850 authored by Ron Rahaman's avatar Ron Rahaman

Merge remote-tracking branch 'upstream/master' into develop

Contains configure scripts, which were a hotfix

Conflicts:
	.gitignore
parents 7365c202 63d87017
Pipeline #8978 failed with stages
......@@ -210,9 +210,7 @@ python/peacock/tests/postprocessor_tab/TestPostprocessorPluginManager_test_scrip
# Giraffe/Nek5000
autom4te.cache/
config.guess
config.sub
configure
install-sh
config.status
giraffe.mk
*.sch
SESSION.NAME
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment