SALOME platform Git repositories - modules/shaper.git/commit

]> SALOME platform Git repositories - modules/shaper.git/commit

projects / modules / shaper.git / commit

author	mpv <mikhail.ponikarov@opencascade.com>
	Fri, 11 Apr 2014 12:40:30 +0000 (16:40 +0400)
committer	mpv <mikhail.ponikarov@opencascade.com>
	Fri, 11 Apr 2014 12:40:30 +0000 (16:40 +0400)
commit	10c74b99318f5265c9a60a178932b03f69adfee5
tree	a5ceee8ef6d4feff32dc3ea8123342ad4aa29ede	tree \| snapshot
parent	a793636ae5265326796c7b5a26a5000041567d43	commit \| diff
parent	7cc3d9e6696b77a8fdf396cbd55370de3f3ebd9e	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
CMakeCommon/FindQt.cmake	diff1 \|	diff2 \|	blob \| history
CMakeCommon/XMLProcessing.cmake	diff1 \|	diff2 \|	blob \| history
eclipse.sh	\|	diff2 \|	blob \| history
linux_env.sh	\|	\|	blob
msvc10_env.bat	\|	diff2 \|	blob \| history

SALOME Shaper module

RSS Atom

CMakeCommon/FindPython.cmake	diff1 \|	diff2 \|	blob \| history
CMakeCommon/FindQt.cmake	diff1 \|	diff2 \|	blob \| history
CMakeCommon/XMLProcessing.cmake	diff1 \|	diff2 \|	blob \| history
eclipse.sh	\|	diff2 \|	blob \| history
linux_env.sh	\|	\|	blob
msvc10_env.bat	\|	diff2 \|	blob \| history