Preparing for upstream merge

2020-10-20 06:53:59 -05:00
parent ffb119fabb
commit 62466d6581
42 changed files with 308 additions and 1961 deletions
--- a/.github/workflows/build_cmake.yml
+++ b/.github/workflows/build_cmake.yml
@@ -2,12 +2,12 @@ name: Building(CMake)

 on:
  push:
-    branches: [ master, master_nc_merge_upstream_test ]
+    branches: [ master ]
    paths-ignore:
      - 'README.md'
      - 'LICENSE'
  pull_request:
-    branches: [ master, master_nc_merge_upstream_test ]
+    branches: [ master ]
    paths-ignore:
      - 'README.md'
      - 'LICENSE'