diff options
| author | Domen Vrankar <domen.vrankar@gmail.com> | 2015-02-27 13:42:29 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-02-27 13:42:29 (GMT) |
| commit | 3cf86d9e7bb082b05c507c744b0a43981ba199c3 (patch) | |
| tree | d2b47a5c21933c3a7d1e1375067394e32b46e62b /Tests/FindPackageTest | |
| parent | 4817d2814a6d82e35590f9bfff2b088c95d45395 (diff) | |
| parent | 1cbb15625304b01e8a99a956fa42e4b7011fea48 (diff) | |
| download | CMake-3cf86d9e7bb082b05c507c744b0a43981ba199c3.zip CMake-3cf86d9e7bb082b05c507c744b0a43981ba199c3.tar.gz CMake-3cf86d9e7bb082b05c507c744b0a43981ba199c3.tar.bz2 | |
Merge branch 'cpack_rpm_mulit_prefix_fixup' into cpack_rpm_mulit_prefix_fixup-for-master
Resolve conflict in Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
by combining the changes from both sides.
Diffstat (limited to 'Tests/FindPackageTest')
0 files changed, 0 insertions, 0 deletions