diff options
| author | Brad King <brad.king@kitware.com> | 2017-12-07 14:10:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-12-07 14:10:31 (GMT) |
| commit | a3f8371c574fc41ae23e02e5514f641f819d4708 (patch) | |
| tree | d5c8714660ac935ec8fa87fe3cde11cd91a21319 | |
| parent | bd49ae5109cb8bf0fc1110bab8b829f5f28bfdd9 (diff) | |
| parent | fcbd02fd6ec56a6a4540e70082e899b45934dab8 (diff) | |
| download | CMake-a3f8371c574fc41ae23e02e5514f641f819d4708.zip CMake-a3f8371c574fc41ae23e02e5514f641f819d4708.tar.gz CMake-a3f8371c574fc41ae23e02e5514f641f819d4708.tar.bz2 | |
Merge branch 'automoc-apple-framework' into autogen-fix-library-deps
Merge using `-s ours` merge strategy because the change is a fix
specific to the 3.10 release series, and we already have a similar fix
in post-3.10 development.
0 files changed, 0 insertions, 0 deletions