Merge branch 'cpp-headers'

This commit is contained in:
John Kessenich 2016-08-11 10:00:57 -06:00
commit 2c6038ecf1
28 changed files with 57 additions and 70 deletions

View file

@ -43,7 +43,7 @@
#include "../glslang/OSDependent/osinclude.h"
#include <stdarg.h>
#include <cstdarg>
#include <algorithm>
namespace glslang {