Merge branch 'master' into cleanup-style

Conflicts:
	Source/CMakeVersion.cmake
This commit is contained in:
Brad King
2012-08-14 08:27:23 -04:00

View File

@@ -2,5 +2,5 @@
set(CMake_VERSION_MAJOR 2)
set(CMake_VERSION_MINOR 8)
set(CMake_VERSION_PATCH 9)
set(CMake_VERSION_TWEAK 20120813)
set(CMake_VERSION_TWEAK 20120814)
#set(CMake_VERSION_RC 1)