diff options
author | Brad King <brad.king@kitware.com> | 2018-03-16 11:52:06 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-03-16 11:52:23 (GMT) |
commit | df27bd3f83f3854df24bce9b0a57b425b0396585 (patch) | |
tree | ef42c83ecd6861a5d59b8263f0f491622859c5ef /Source/cmGlobalVisualStudio15Generator.h | |
parent | 298e1bfe2870d649ed1ec0054137d6417c7d5ef2 (diff) | |
parent | 96fdde26bbbc969944e556ad649191cd21f46990 (diff) | |
download | CMake-df27bd3f83f3854df24bce9b0a57b425b0396585.zip CMake-df27bd3f83f3854df24bce9b0a57b425b0396585.tar.gz CMake-df27bd3f83f3854df24bce9b0a57b425b0396585.tar.bz2 |
Merge branch 'gtest_discover_tests_timeout' into release-3.11
Merge-request: !1851
Diffstat (limited to 'Source/cmGlobalVisualStudio15Generator.h')
0 files changed, 0 insertions, 0 deletions