Salome HOME
Merge V9_dev branch into master
authorrnv <rnv@opencascade.com>
Thu, 14 Jun 2018 11:48:18 +0000 (14:48 +0300)
committerrnv <rnv@opencascade.com>
Thu, 14 Jun 2018 11:48:18 +0000 (14:48 +0300)
1  2 
doc/files/tutorial_1.py
idl/Gen.xml
src/HOMARD_I/CMakeLists.txt
src/HOMARD_I/HOMARD_Gen_i.cxx
src/tests/Test/test_6.py

Simple merge
diff --cc idl/Gen.xml
Simple merge
Simple merge
Simple merge
index d21baf482d7288e31048fec26e7a6e0999234b21,c329efdceb445b21061065375eea8a1621f0729c..9f062dbff0c74b2cf2afd5da33322b785febd49d
@@@ -1,4 -1,3 +1,4 @@@
- #!/usr/bin/env python
++#!/usr/bin/env python3
  # -*- coding: utf-8 -*-
  # Copyright (C) 2011-2016  CEA/DEN, EDF R&D
  #