Merge remote-tracking branch 'origin/5.1'

Authored by antonanikin on Apr 27 2017, 1:45 PM.

Description

Merge remote-tracking branch 'origin/5.1'

  1. Conflicts:
  2. projectmanagers/cmake/cmakeutils.cpp

Merged Changes

CommitAuthorDetailsCommitted
15cf6348660cD5609antonanikin
CMake - fix bug with dropping changed settings for existing build directory 
Apr 27 2017

Empty Commit

This commit is empty and does not affect any paths.