Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0

author sbh <sergey.belash@opencascade.com>

Wed, 15 Apr 2015 11:52:09 +0000 (14:52 +0300)

committer sbh <sergey.belash@opencascade.com>

Wed, 15 Apr 2015 11:52:09 +0000 (14:52 +0300)
author sbh <sergey.belash@opencascade.com>
Wed, 15 Apr 2015 11:52:09 +0000 (14:52 +0300)
committer sbh <sergey.belash@opencascade.com>
Wed, 15 Apr 2015 11:52:09 +0000 (14:52 +0300)
diff --cc src/ParametersPlugin/ParametersPlugin_Parameter.cpp
Simple merge
author	sbh <sergey.belash@opencascade.com>
	Wed, 15 Apr 2015 11:52:09 +0000 (14:52 +0300)
committer	sbh <sergey.belash@opencascade.com>
	Wed, 15 Apr 2015 11:52:09 +0000 (14:52 +0300)