diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-06 19:48:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-11-06 19:52:49 (GMT) |
| commit | 67c4be51a34f86d4c26fa9f1f2f79f5539493eee (patch) | |
| tree | e44eefd24b5b5b6931c3783b911e62e5be77f9af /Modules/FindSDL_image.cmake | |
| parent | 917da5d02766e875ec63eca09eb52b789114674c (diff) | |
| parent | 79349ed8fc22f70de7f839b2323cf3e93aca9bc9 (diff) | |
| download | CMake-67c4be51a34f86d4c26fa9f1f2f79f5539493eee.zip CMake-67c4be51a34f86d4c26fa9f1f2f79f5539493eee.tar.gz CMake-67c4be51a34f86d4c26fa9f1f2f79f5539493eee.tar.bz2 | |
Merge branch 'release-doc-formatting' into doc-formatting
Resolve conflict in Modules/ExternalProject.cmake by keeping our side,
which is more completely revised.
Diffstat (limited to 'Modules/FindSDL_image.cmake')
| -rw-r--r-- | Modules/FindSDL_image.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/FindSDL_image.cmake b/Modules/FindSDL_image.cmake index fc2c043..49b5e40 100644 --- a/Modules/FindSDL_image.cmake +++ b/Modules/FindSDL_image.cmake @@ -11,7 +11,8 @@ # SDL_IMAGE_LIBRARIES, the name of the library to link against # SDL_IMAGE_INCLUDE_DIRS, where to find the headers # SDL_IMAGE_FOUND, if false, do not try to link against -# SDL_IMAGE_VERSION_STRING - human-readable string containing the version of SDL_image +# SDL_IMAGE_VERSION_STRING - human-readable string containing the +# version of SDL_image # # # |