Merge remote branch 'origin/bsr/medmpi'

author vsr <vsr@opencascade.com>

Tue, 10 Feb 2015 16:07:38 +0000 (19:07 +0300)

committer vsr <vsr@opencascade.com>

Tue, 10 Feb 2015 16:07:38 +0000 (19:07 +0300)
author vsr <vsr@opencascade.com>
Tue, 10 Feb 2015 16:07:38 +0000 (19:07 +0300)
committer vsr <vsr@opencascade.com>
Tue, 10 Feb 2015 16:07:38 +0000 (19:07 +0300)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/HOMARDGUI/HomardQtCommun.cxx
Simple merge
diff --cc src/HOMARD_I/HomardMedCommun.cxx
Simple merge
author	vsr <vsr@opencascade.com>
	Tue, 10 Feb 2015 16:07:38 +0000 (19:07 +0300)
committer	vsr <vsr@opencascade.com>
	Tue, 10 Feb 2015 16:07:38 +0000 (19:07 +0300)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/HOMARDGUI/HomardQtCommun.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/HOMARD_I/HomardMedCommun.cxx	patch \|	diff1 \|	diff2 \|	blob \| history