diff options
| author | Brad King <brad.king@kitware.com> | 2013-06-28 18:29:54 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-06-28 18:29:54 -0400 |
| commit | 4e5cb398ae392079031ae6a880569349c29770a6 (patch) | |
| tree | 55b13e53e2368e0425602fb8527936accc50ac9a /Modules/CheckSizeOf.cmake | |
| parent | 78fdbbcb4130eedc2cb48ec9e67fad5c2beffb0e (diff) | |
| parent | daaf6283f5c0e8b7ea7ee93f983ad56d4498788d (diff) | |
| download | cmake-4e5cb398ae392079031ae6a880569349c29770a6.tar.gz | |
Merge branch 'master' into vs12-generator
Resolve conflicts in Tests/Preprocess/CMakeLists.txt by keeping
the side from 'master'.
Diffstat (limited to 'Modules/CheckSizeOf.cmake')
| -rw-r--r-- | Modules/CheckSizeOf.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CheckSizeOf.cmake b/Modules/CheckSizeOf.cmake index 9f587b5c28..f0707df4e3 100644 --- a/Modules/CheckSizeOf.cmake +++ b/Modules/CheckSizeOf.cmake @@ -15,4 +15,4 @@ message(SEND_ERROR "Modules/CheckSizeOf.cmake has been removed. " "Use Modules/CheckTypeSize.cmake instead. This " - "compatability check may be removed before the next release!") + "compatibility check may be removed before the next release!") |