Merge branch 'apl/22873_tmp'

author rnv <rnv@opencascade.com>

Fri, 20 Jan 2017 14:57:04 +0000 (17:57 +0300)

committer rnv <rnv@opencascade.com>

Fri, 20 Jan 2017 14:57:04 +0000 (17:57 +0300)
author rnv <rnv@opencascade.com>
Fri, 20 Jan 2017 14:57:04 +0000 (17:57 +0300)
committer rnv <rnv@opencascade.com>
Fri, 20 Jan 2017 14:57:04 +0000 (17:57 +0300)
diff --cc src/GEOMGUI/GEOM_Displayer.cxx

index ac487941684e670aa261f2341f27fa98749d4d98,137895022032b5b30f2c197dc80b5b361226126d..c03b93777bb4763da0c4d2de6a0136a17b9baaab

mode 100644,100755..100755
--- 1/src/GEOMGUI/GEOM_Displayer.cxx
--- 2/src/GEOMGUI/GEOM_Displayer.cxx
+++ b/src/GEOMGUI/GEOM_Displayer.cxx
diff --cc src/GEOMGUI/GeometryGUI.cxx

index 153d10f01c7d70085923805018f38fd88b6e903b,49a223a0a408accc1e81e2dee049958976e43c81..305d6e47d11df7621cc728156b7236ca42241bce

mode 100644,100755..100755
--- 1/src/GEOMGUI/GeometryGUI.cxx
--- 2/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
author	rnv <rnv@opencascade.com>
	Fri, 20 Jan 2017 14:57:04 +0000 (17:57 +0300)
committer	rnv <rnv@opencascade.com>
	Fri, 20 Jan 2017 14:57:04 +0000 (17:57 +0300)
		1	2
src/GEOMGUI/GEOM_Displayer.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
src/GEOMGUI/GeometryGUI.cxx	patch \|	diff1 \|	diff2 \|	blob \| history