Merged default into minor

--HG--
branch : minor

src/modules/graphics/opengl/Canvas.cpp

@@ -22,10 +22,9 @@
 #include "Image.h"
 #include "Graphics.h"
 #include "common/Matrix.h"
-#include "common/config.h"
 
 #include <cstring> // For memcpy
-#include <limits>
+#include <algorithm> // For min/max
 
 namespace love
 {

src/modules/graphics/opengl/Canvas.h

@@ -21,6 +21,7 @@
 #ifndef LOVE_GRAPHICS_OPENGL_CANVAS_H
 #define LOVE_GRAPHICS_OPENGL_CANVAS_H
 
+#include "common/config.h"
 #include "graphics/Color.h"
 #include "image/Image.h"
 #include "image/ImageData.h"