Merge branch 'release-4-6' into release-5-0
authorMark Abraham <mark.j.abraham@gmail.com>
Sat, 28 Jun 2014 18:59:54 +0000 (20:59 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Sat, 28 Jun 2014 19:01:39 +0000 (21:01 +0200)
commit04eef6613c1b48de0fbd36b114544f8c926051d3
tree6f3b887bb2e5cbaf3c48957339128710cbd21906
parent41c86c010941145041ba52cba4d3f6f233a01ee0
parent6fdca5f55dc8b6f23f118c498558ed16f46a0b72
Merge branch 'release-4-6' into release-5-0

Conflicts:
CMakeLists.txt
Left CMake version condition in favour of new fix from release-4-6;
actual settings logic from release-5-0.

Change-Id: I493571b2aca74647a7547d5c2d9463679bdd858a
CMakeLists.txt