Merge remote-tracking branch 'origin/master'

This commit is contained in:
Marc Zinnschlag 2014-04-01 18:45:25 +02:00
commit c9f9566623

View file

@ -116,7 +116,7 @@ if (WIN32)
endif() endif()
# We probably support older versions than this. # We probably support older versions than this.
cmake_minimum_required(VERSION 999.6) cmake_minimum_required(VERSION 2.6)
# source directory: libs # source directory: libs