Merge branch 'master' into compatibility

Conflicts:
	src/SceneGraph/MatrixTransformation2D.h
	src/SceneGraph/RigidMatrixTransformation2D.h

src/Platform/WindowlessNaClApplication.cpp

@@ -67,7 +67,7 @@ void WindowlessNaClApplication::createContext(Configuration* configuration) {
     } else delete configuration;
 }
 
-bool WindowlessNaClApplication::tryCreateContext(Configuration* configuration) {
+bool WindowlessNaClApplication::tryCreateContext(Configuration*) {
     CORRADE_ASSERT(!c, "Platform::WindowlessNaClApplication::tryCreateContext(): context already created", false);
 
     const std::int32_t attributes[] = {

src/SceneGraph/MatrixTransformation2D.h

@@ -177,6 +177,13 @@ template<class T> class BasicMatrixTransformation2D: public AbstractBasicTransla
 
 template<class T> inline BasicMatrixTransformation2D<T>::BasicMatrixTransformation2D() = default;
 
+/**
+@brief Two-dimensional transformation for float scenes implemented using matrices
+
+@see @ref MatrixTransformation3D
+*/
+typedef BasicMatrixTransformation2D<Float> MatrixTransformation2D;
+
 }}
 
 #endif

src/SceneGraph/RigidMatrixTransformation2D.h

@@ -210,6 +210,13 @@ template<class T> class BasicRigidMatrixTransformation2D: public AbstractBasicTr
 
 template<class T> inline BasicRigidMatrixTransformation2D<T>::BasicRigidMatrixTransformation2D() = default;
 
+/**
+@brief Two-dimensional rigid transformation for float scenes implemented using matrices
+
+@see @ref RigidMatrixTransformation3D
+*/
+typedef BasicRigidMatrixTransformation2D<Float> RigidMatrixTransformation2D;
+
 }}
 
 #endif