diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2015-10-01 08:59:07 -0400 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2015-10-01 08:59:07 -0400 |
| commit | 49b328bd30365b6fcb19eeebdaa43f4430285c50 (patch) | |
| tree | 7173389cadb781c4913aa85c2b4987ca8dc6dcfe /include/common.h | |
| parent | 68ec0bf510fd16cf4e6d7aabd7998fe656c25444 (diff) | |
Fixed conflicts
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/common.h b/include/common.h index fba7e32..985dddf 100644 --- a/include/common.h +++ b/include/common.h @@ -9,6 +9,7 @@ #include <cstdlib> #include <SDL2/SDL.h> #include <SDL2/SDL_image.h> +#include <SDL2/SDL_mixer.h> #include <SDL2/SDL_opengl.h> typedef struct { float x; float y; }vec2; |