Merge branch 'main' into use-sasdata

# Conflicts: # src/examples/test_panel2D.py
SasView · Aug 18, 2022 · 289f9bb · 289f9bb
2 parents 492c943 + a249adb
commit 289f9bb
Show file tree

Hide file tree

Showing 264 changed files with 879 additions and 24,673 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/build_tools/Makefile_RHEL7 b/build_tools/Makefile_RHEL7
diff --git a/build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/CMakeLists.txt b/build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/CMakeLists.txt
diff --git a/build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/README.md b/build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/README.md
diff --git a/build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/environment.yml b/build_tools/Vagrant/Ubuntu1404/Build_deb_rpm/environment.yml