From: Paul RASCLE <paul.rascle@edf.fr>
Date: Thu, 10 Apr 2014 08:09:09 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/vsr/fix_single_study_pb' into pre/fix_single_study
X-Git-Tag: V7_4_0b1~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0fac7040be417aab7228a4e23904b4cf22a8dda4;p=modules%2Fkernel.git

Merge remote-tracking branch 'origin/vsr/fix_single_study_pb' into pre/fix_single_study
---

0fac7040be417aab7228a4e23904b4cf22a8dda4
diff --cc src/KERNEL_PY/__init__.py
index 284650319,da81c5ad9..6933a14f2
mode 100644,100755..100755
--- a/src/KERNEL_PY/__init__.py
+++ b/src/KERNEL_PY/__init__.py
diff --cc src/KERNEL_PY/salome_iapp.py
index 860649539,dcea86988..6aa3c9f5e
mode 100644,100755..100755
--- a/src/KERNEL_PY/salome_iapp.py
+++ b/src/KERNEL_PY/salome_iapp.py
diff --cc src/KERNEL_PY/salome_kernel.py
index 6a6be1911,65602bca4..9824f788b
mode 100644,100755..100755
--- a/src/KERNEL_PY/salome_kernel.py
+++ b/src/KERNEL_PY/salome_kernel.py
diff --cc src/KERNEL_PY/salome_study.py
index d408d0514,24a676314..5e01b758c
mode 100644,100755..100755
--- a/src/KERNEL_PY/salome_study.py
+++ b/src/KERNEL_PY/salome_study.py