From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Thu, 1 Oct 2015 12:59:07 +0000 (-0400)
Subject: Fixed conflicts
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=49b328bd30365b6fcb19eeebdaa43f4430285c50;p=clyne%2Fgamedev.git

Fixed conflicts
---

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;