diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-02-23 22:29:12 -0500 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-02-23 22:29:12 -0500 |
| commit | 8a2517c3068bb8fc7b22a01a2f75ab5537342063 (patch) | |
| tree | d1a9973766afa8f09a6676155ff78908db4821ef /include/common.h | |
| parent | d1ee9a1b4b4d02b564b554a30314a97c1982da22 (diff) | |
| parent | 0396f428411eb015f796643f9e7e38ca97f8fd42 (diff) | |
Merge branch 'master' of http://github.com/tcsullivan/gamedev
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/common.h b/include/common.h index 34260c9..a99e352 100644 --- a/include/common.h +++ b/include/common.h @@ -16,6 +16,8 @@ #include <string> #include <fstream> #include <thread> +#include <mutex> +#include <future> #define GLEW_STATIC #include <GL/glew.h> |