From: Gilles DAVID <gilles-g.david@edf.fr>
Date: Tue, 19 Sep 2017 15:32:22 +0000 (+0200)
Subject: Merge branch 'gdd_env_modules_in_config_appli'
X-Git-Tag: V9_0_0~10^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0d6b1b8d090419bcfe31b9a45c7bea2b73a883f9;p=modules%2Fkernel.git

Merge branch 'gdd_env_modules_in_config_appli'

Conflicts:
	bin/salomeContext.py
---

0d6b1b8d090419bcfe31b9a45c7bea2b73a883f9
diff --cc bin/appli_gen.py
index 4e7e228dd,7dc3e8987..0dbab540b
mode 100644,100755..100755
--- a/bin/appli_gen.py
+++ b/bin/appli_gen.py