From: rnv <rnv@opencascade.com>
Date: Thu, 8 Jun 2017 12:12:57 +0000 (+0300)
Subject: Merge multi-study removal branch
X-Git-Tag: Before_python3_27062017~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0a319a52bf4f9e1b9389e160ff8e12ec233297e0;p=modules%2Fmed.git

Merge multi-study removal branch
---

0a319a52bf4f9e1b9389e160ff8e12ec233297e0
diff --cc src/MEDCalc/cmp/test_medcalc_components.py
index 246c246a6,69e10785d..d2db81bce
--- a/src/MEDCalc/cmp/test_medcalc_components.py
+++ b/src/MEDCalc/cmp/test_medcalc_components.py
@@@ -61,9 -61,9 +61,9 @@@ if salome.lcc is None
  __import__(corbaModule)
  factory=salome.lcc.FindOrLoadComponent(containerType,componentName)
  # This is not the main CORBA component of the SALOME module MED
- # (i.e. the engine associated to the active study), but the CORBA
+ # (i.e. the engine associated to the study), but the CORBA
  # entry point for MED fields operations (i.e. a CORBA component
 -# reachable throught the LifeCycleCORBA). This entry point is used to
 +# reachable throughout the LifeCycleCORBA). This entry point is used to
  # get the other SALOME CORBA components required for MED field
  # operations, in particular the dataManager and the calculator