Merge remote-tracking branch 'origin/5.1'
- Conflicts:
- projectmanagers/cmake/cmakeutils.cpp
antonanikin | Apr 27 2017, 1:45 PM |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
15cf6348660c | D5609 | antonanikin | CMake - fix bug with dropping changed settings for existing build directory | Apr 27 2017 |