diff options
| author | Brad King <brad.king@kitware.com> | 2024-01-25 15:53:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-01-25 15:56:25 (GMT) |
| commit | 2cdf47ee41eb2e197479f7f6759aa61ead3707d4 (patch) | |
| tree | 42f545e8385bb1da68b7799a1fc35e0ebd48377c /Source/cmConvertMSBuildXMLToJSON.py | |
| parent | 3ff29f9f5e3334fabcdc88d75ce6c52ab5111f5e (diff) | |
| parent | bcbb212df704d36736731aa567b291fd97401804 (diff) | |
| download | CMake-2cdf47ee41eb2e197479f7f6759aa61ead3707d4.zip CMake-2cdf47ee41eb2e197479f7f6759aa61ead3707d4.tar.gz CMake-2cdf47ee41eb2e197479f7f6759aa61ead3707d4.tar.bz2 | |
Merge topic 'revert-replace-cmsysprocess-with-cmuvprocesschain' with -s ours
Use the `-s ours` merge strategy to avoid actually reverting the
original changes inpost-3.28 development.
bcbb212df7 Revert use of libuv for process execution for 3.28
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9176
Diffstat (limited to 'Source/cmConvertMSBuildXMLToJSON.py')
0 files changed, 0 insertions, 0 deletions