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

Contains configure scripts, which were a hotfix Conflicts: .gitignore

Merge remote-tracking branch 'upstream/master' into develop
Contains configure scripts, which were a hotfix Conflicts: .gitignore
05603850 · Ron Rahaman · 7365c202 · 63d87017 · 05603850 · 05603850
Commit 05603850 authored Jun 13, 2018 by Ron Rahaman
Showing with 10913 additions and 4 deletions

.gitignore .gitignore +2 -4

config.guess config.guess +1558 -0

config.sub config.sub +1791 -0

configure configure +7035 -0

install-sh install-sh +527 -0

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -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
--- a/config.guess
+++ b/config.guess
--- a/config.sub
+++ b/config.sub
--- a/configure
+++ b/configure
--- a/install-sh
+++ b/install-sh