Salome HOME
Merge changes from 'master' branch.
authorrnv <rnv@opencascade.com>
Thu, 21 Dec 2017 12:33:14 +0000 (15:33 +0300)
committerrnv <rnv@opencascade.com>
Fri, 29 Dec 2017 13:34:03 +0000 (16:34 +0300)
commitb83fb6d7abaf9107af18da173555c10bcd3f0163
tree277865c769ce9024a4bb2727187618acd53bef84
parent539cfdb9eecb39294cf1b993007db9ba1e5470c6
parent3aed465afeafa82d08f9e61f209c722eff1e6e68
Merge changes from 'master' branch.
cmake/SalomeMacros.cmake
cmake/UsePyQt.cmake
config/salome.xml