Salome HOME
Merge remote branch 'origin/V7_dev'
authorvsr <vsr@opencascade.com>
Mon, 6 Jun 2016 08:40:38 +0000 (11:40 +0300)
committervsr <vsr@opencascade.com>
Mon, 6 Jun 2016 08:40:38 +0000 (11:40 +0300)
commita87a08f59deb969278f732bd28ef0c8413e97723
treed4d7a7480d42181b8e28ad56d361d6546b4e419d
parent66878b26e99b42a47bc1158616e9028c345c372e
parent5ff8aefcdfe879f8f899ea7450197c49af05c1f5
Merge remote branch 'origin/V7_dev'

Conflicts:
module_generator/yacsgen_version.py