From: Renaud NEDELEC Date: Wed, 4 Nov 2015 09:42:04 +0000 (+0100) Subject: Merge branch 'python_parametric_api' of https://git.salome-platform.org/git/modules... X-Git-Tag: V_2.1.0~206^2~16 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c3ae28ba30027cc4a6a757ef623f40adaae96ead;p=modules%2Fshaper.git Merge branch 'python_parametric_api' of https://git.salome-platform.org/git/modules/shaper into python_parametric_api Conflicts: src/PythonAPI/model/sketcher/line.py --- c3ae28ba30027cc4a6a757ef623f40adaae96ead