Merge branch 'master' into unstable

Conflicts: THEMES.md (keep unstable branch's)
Aloshi · Dec 15, 2013 · ed64c22 · ed64c22
2 parents 1398785 + 019e78d
commit ed64c22
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 63 deletions.
diff --git a/CMake/Packages/FindFreeType.cmake b/CMake/Packages/FindFreeType.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,7 +32,7 @@ if(${GLSystem} MATCHES "Desktop OpenGL")
 else()
     find_package(OpenGLES REQUIRED)
 endif()
-find_package(FreeType REQUIRED)
+find_package(Freetype REQUIRED)
 find_package(FreeImage REQUIRED)
 find_package(SDL2 REQUIRED)
 find_package(Boost REQUIRED COMPONENTS system filesystem regex date_time)