From: Gilles DAVID <gilles-g.david@edf.fr>
Date: Wed, 20 Sep 2017 13:18:39 +0000 (+0200)
Subject: Merge branch 'gdd_env_modules_in_config_appli' into gdd/merge_gdd_env_modules_in_conf... 
X-Git-Tag: V8_4_0b1~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3f353148bd2e75cc28815529b40ab04f3966460b;p=modules%2Fkernel.git

Merge branch 'gdd_env_modules_in_config_appli' into gdd/merge_gdd_env_modules_in_config_appli

Conflicts:
	bin/salomeContext.py
---

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