Merge branch 'master' into v0.6.0

# Conflicts:
#	nix/build-all.py
This commit is contained in:
Thomas Krijnen
2019-05-21 13:30:58 +02:00
2 changed files with 7 additions and 4 deletions
+1 -1
View File
@@ -61,9 +61,9 @@
#ifdef _MSC_VER
#include <io.h>
#include <fcntl.h>
#endif
// C++11 header:
#include <random>
#endif
#if defined(_MSC_VER) && defined(_UNICODE)
typedef std::wstring path_t;