From: rnv <rnv@opencascade.com>
Date: Fri, 20 Jan 2017 14:57:04 +0000 (+0300)
Subject: Merge branch 'apl/22873_tmp'
X-Git-Tag: SHAPER_2.7.0~12
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=da1f1aaec0cdc0d371cc992dcf44ea1156c21edc;p=modules%2Fgeom.git

Merge branch 'apl/22873_tmp'
---

da1f1aaec0cdc0d371cc992dcf44ea1156c21edc
diff --cc src/GEOMGUI/GEOM_Displayer.cxx
index ac4879416,137895022..c03b93777
mode 100644,100755..100755
--- a/src/GEOMGUI/GEOM_Displayer.cxx
+++ b/src/GEOMGUI/GEOM_Displayer.cxx
diff --cc src/GEOMGUI/GeometryGUI.cxx
index 153d10f01,49a223a0a..305d6e47d
mode 100644,100755..100755
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx