-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2478 from evoskuil/master
Problem: assert used for ZAP error handling aborts process.
- Loading branch information
Showing
13 changed files
with
146 additions
and
101 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<!-- These values are populated into the package.gsl templates by package.bat. --> | ||
<!-- The target attribute controls path and file name only, id controls package naming. --> | ||
<package id="libzmq_vc120" target="libzmq" version = "4.2.20.0" pathversion="4_2_20_0" platformtoolset="v120"> | ||
<package id="libzmq_vc120" target="libzmq" version = "4.2.20.1" pathversion="4_2_20_1" platformtoolset="v120"> | ||
<!--<dependency id="libsodium_vc120" version="1.0.12.0" />--> | ||
</package> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.