diff options
| author | Brad King <brad.king@kitware.com> | 2012-08-14 12:27:23 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-08-14 12:27:23 (GMT) |
| commit | 68bc863d5bd64f3e893722e403d4fd56bd2e175a (patch) | |
| tree | 515fcf4fdee211067497339acb52de321640c4fc /Source | |
| parent | a05eba57b50fa3224ed7579a604f9a84c44c6d02 (diff) | |
| parent | 9acb4f118cd9a52aaa66897b1c0cd11dace3851c (diff) | |
| download | CMake-68bc863d5bd64f3e893722e403d4fd56bd2e175a.zip CMake-68bc863d5bd64f3e893722e403d4fd56bd2e175a.tar.gz CMake-68bc863d5bd64f3e893722e403d4fd56bd2e175a.tar.bz2 | |
Merge branch 'master' into cleanup-style
Conflicts:
Source/CMakeVersion.cmake
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index a18d820..3632bc9 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -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) |