diff options
author | Brad King <brad.king@kitware.com> | 2017-10-27 13:31:04 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2017-10-27 13:31:04 (GMT) |
commit | 197b4e18d45331eab5225e6cb9433a13430fd0ba (patch) | |
tree | 95938450118fe9d8ec70e03da755f15be26bc8c9 /Tests/QtAutogen | |
parent | 971b8c3c80372adf6cef54313927bc462f51d7da (diff) | |
parent | 992962c76dd472fa9d122231c89d8d11aedd3288 (diff) | |
download | CMake-197b4e18d45331eab5225e6cb9433a13430fd0ba.zip CMake-197b4e18d45331eab5225e6cb9433a13430fd0ba.tar.gz CMake-197b4e18d45331eab5225e6cb9433a13430fd0ba.tar.bz2 |
Merge branch 'backport-fix-co-compile' into fix-co-compile
Resolve a logical conflict by replacing `cmArray{Begin,End}` from
the their side with `cm::{cbegin,cend}` from our side.
Diffstat (limited to 'Tests/QtAutogen')
0 files changed, 0 insertions, 0 deletions