Merge branch 'master' into compatibility

12 years ago · d0f767c15b
2 changed files with 2 additions and 1 deletions
--- a/src/Magnum/Platform/NaClApplication.cpp
+++ b/src/Magnum/Platform/NaClApplication.cpp
@ -30,7 +30,7 @@
 #include <ppapi/cpp/completion_callback.h>
 #include <Corrade/Utility/NaClStreamBuffer.h>

-#include "Magnum/Context.h"
+#include "Magnum/Platform/Context.h"
 #include "Magnum/Platform/ScreenedApplication.hpp"

 namespace Magnum { namespace Platform {
--- a/src/Magnum/Platform/WindowlessNaClApplication.h
+++ b/src/Magnum/Platform/WindowlessNaClApplication.h
@ -38,6 +38,7 @@
 #include <ppapi/gles2/gl2ext_ppapi.h>

 #include "Magnum/Magnum.h"
+#include "Magnum/Platform/Platform.h"

 namespace pp {
    class Graphics3D;