diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-13 19:09:36 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-09-13 19:09:36 (GMT) |
| commit | 06c8a37e5816f2431b469b37961588f494fefcd4 (patch) | |
| tree | 66e22eabf8ad6faf7ab49de5dc70e565519d9e97 | |
| parent | 420874bfaa20772525c60b20d1ee5b6ef5ed9298 (diff) | |
| parent | b494308dab7ca3fe94ce558ddddc71bcaf1a8e6d (diff) | |
| download | CMake-06c8a37e5816f2431b469b37961588f494fefcd4.zip CMake-06c8a37e5816f2431b469b37961588f494fefcd4.tar.gz CMake-06c8a37e5816f2431b469b37961588f494fefcd4.tar.bz2 | |
Merge branch 'backport-autogen-target-depends' into autogen-target-depends-fix-3-9-2
Use the "ours" merge strategy because we already have equivalent
changes on our side.
0 files changed, 0 insertions, 0 deletions