Merge remote-tracking branch 'origin/master'

author Paul RASCLE <paul.rascle@edf.fr>

Tue, 6 Mar 2018 10:35:08 +0000 (11:35 +0100)

committer Paul RASCLE <paul.rascle@edf.fr>

Tue, 6 Mar 2018 10:35:08 +0000 (11:35 +0100)
author Paul RASCLE <paul.rascle@edf.fr>
Tue, 6 Mar 2018 10:35:08 +0000 (11:35 +0100)
committer Paul RASCLE <paul.rascle@edf.fr>
Tue, 6 Mar 2018 10:35:08 +0000 (11:35 +0100)
diff --cc src/SMESH_SWIG/smeshBuilder.py
Simple merge
author	Paul RASCLE <paul.rascle@edf.fr>
	Tue, 6 Mar 2018 10:35:08 +0000 (11:35 +0100)
committer	Paul RASCLE <paul.rascle@edf.fr>
	Tue, 6 Mar 2018 10:35:08 +0000 (11:35 +0100)