Merge branch 'master' into EGL

Conflicts:
	src/CMakeLists.txt
This commit is contained in:
Camilla Berglund
2012-07-22 16:19:24 +02:00
7 changed files with 335 additions and 4 deletions
+1 -1
View File
@@ -315,7 +315,7 @@ configure_file(${GLFW_SOURCE_DIR}/src/config.h.in
# The src directory's CMakeLists.txt file installs the library
#--------------------------------------------------------------------
install(DIRECTORY include/GL DESTINATION include
FILES_MATCHING PATTERN glfw3.h)
FILES_MATCHING PATTERN glfw3.h PATTERN glfw3native.h)
install(FILES COPYING.txt readme.html
DESTINATION share/doc/glfw-${GLFW_VERSION_FULL})