Merge branch 'master' into d3d12

2018-11-22 20:59:55 +03:00
parent 14b623465c 086d7e9da7
commit da280347c4
130 changed files with 481 additions and 248 deletions
--- a/2
+++ b/2
@@ -304,7 +304,7 @@ def get_clang_format_binary():
        if has_bin(binary):
            return binary
    print('ERROR: clang-format is not on PATH')
-    print('LLVM is available from http://llvm.org/releases/download.html')
+    print('LLVM is available from https://llvm.org/releases/download.html')
    print('At least version 3.8 is required.')
    print('See docs/style_guide.md for instructions on how to get it.')
    sys.exit(1)