Merge pull request #333 from ethouris/maint-mergeback-dev

Dev branch mergeback
Haivision · Apr 9, 2018 · 5276995 · 5276995
2 parents 1367914 + 5f74555
commit 5276995
Show file tree

Hide file tree

Showing 115 changed files with 21,822 additions and 9,907 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -29,9 +29,9 @@ build_script:
 
 after_build:
 - cmd: >-
-    gather-package.bat
+    scripts/gather-package.bat
         7z a SRT-%APPVEYOR_REPO_BRANCH%-%CONFIGURATION%-%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\package\*
         appveyor PushArtifact SRT-%APPVEYOR_REPO_BRANCH%-%CONFIGURATION%-%APPVEYOR_BUILD_VERSION%.zip
 
 on_finish:
- # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))