Merge default into minor

--HG--
branch : minor
This commit is contained in:
Bart van Strien
2016-07-14 18:42:42 +02:00
19 changed files with 257 additions and 85 deletions
+5 -1
View File
@@ -25,7 +25,11 @@
#import <Foundation/Foundation.h>
#import <Cocoa/Cocoa.h>
#include <SDL2/SDL.h>
#ifdef LOVE_MACOSX_SDL_DIRECT_INCLUDE
# include <SDL.h>
#else
# include <SDL2/SDL.h>
#endif
namespace love
{