Merge remote-tracking branch 'singu/master'

This commit is contained in:
Aleric Inglewood
2013-04-23 19:41:11 +02:00
83 changed files with 5325 additions and 3388 deletions

View File

@@ -336,4 +336,6 @@ MARK_AS_ADVANCED(
CMAKE_SHARED_LINKER_FLAGS_RELEASE
)
include(GooglePerfTools)
endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)