Merge remote-tracking branch 'github/markdown'

diff --combined CMakeLists.txt
index 8438974a414ac74f7d1b6602f706bf4ea38ef3f9,1b86790ffa544189583e7d3beb8068f280012949..3d6687132de50f10294b712213e838ac987ed2d4
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -105,7 -105,7 +105,7 @@@ endif (
  
  # Put all executables into the same top level build directory, regardless of
  # which subdirectory they are declared
 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 +set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
  
  
  ##############################################################################
@@@ -139,8 -139,6 +139,8 @@@ include_directories (${CMAKE_CURRENT_SO
  ##############################################################################
  # Common libraries / utilities
  
 +include_directories (${CMAKE_CURRENT_SOURCE_DIR})
 +
  add_custom_command (
      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
      COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glproc.py > ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
@@@ -376,7 -374,7 +376,7 @@@ endif (QT4_FOUND AND QJSON_FOUND
  ##############################################################################
  # Packaging
  
- install (FILES LICENSE README TODO DESTINATION doc)
+ install (FILES LICENSE README.markdown TODO.markdown DESTINATION doc)
  
  set (CPACK_PACKAGE_VERSION_MAJOR "1")
  set (CPACK_PACKAGE_VERSION_MINOR "0")