From: skv <skv@opencascade.com>
Date: Wed, 5 Aug 2015 13:50:07 +0000 (+0300)
Subject: Merge branch 'skv/new_caf'
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4f53f6fe65cf35b62c43217fc58dc9395a8fb2c5;p=modules%2Fgeom.git

Merge branch 'skv/new_caf'
---

4f53f6fe65cf35b62c43217fc58dc9395a8fb2c5
diff --cc src/GEOM_I/GEOM_Gen_i.cc
index 7f60f803e,04d035225..d5227660d
mode 100755,100644..100644
--- a/src/GEOM_I/GEOM_Gen_i.cc
+++ b/src/GEOM_I/GEOM_Gen_i.cc