Salome HOME
Fix problem of bad merge
authorvsr <vsr@opencascade.com>
Fri, 11 Apr 2014 12:49:55 +0000 (16:49 +0400)
committervsr <vsr@opencascade.com>
Fri, 11 Apr 2014 12:49:55 +0000 (16:49 +0400)
commitf9cdce14d490edad7e52f18c38780f76a8b37d85
tree586584212422262c803980d98d7751ee84ba492e
parente4fc109108c2ac4a5f18cae44d637cb73fcef666
Fix problem of bad merge
bin/killSalome.py
bin/killSalomeWithPort.py