Salome HOME
Merge branch 'origin/BR_PORTING_CENTOS_6_3'
authormpv <mikhail.ponikarov@opencascade.com>
Fri, 11 Apr 2014 12:40:30 +0000 (16:40 +0400)
committermpv <mikhail.ponikarov@opencascade.com>
Fri, 11 Apr 2014 12:40:30 +0000 (16:40 +0400)
commit10c74b99318f5265c9a60a178932b03f69adfee5
treea5ceee8ef6d4feff32dc3ea8123342ad4aa29ede
parenta793636ae5265326796c7b5a26a5000041567d43
parent7cc3d9e6696b77a8fdf396cbd55370de3f3ebd9e
Merge branch 'origin/BR_PORTING_CENTOS_6_3'

Conflicts:
CMakeCommon/FindPython.cmake
CMakeCommon/FindQt.cmake
CMakeCommon/XMLProcessing.cmake
src/Config/CMakeLists.txt
src/Event/CMakeLists.txt
src/Model/CMakeLists.txt
src/ModelAPI/CMakeLists.txt
src/ModuleBase/CMakeLists.txt
src/PartSet/CMakeLists.txt
src/PartSetPlugin/CMakeLists.txt
src/XGUI/CMakeLists.txt
CMakeCommon/FindPython.cmake
CMakeCommon/FindQt.cmake
CMakeCommon/XMLProcessing.cmake
eclipse.sh
linux_env.sh
msvc10_env.bat