From: mzn <mzn@opencascade.com>
Date: Tue, 2 Jun 2015 08:07:14 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/BR_v14_rc' into BR_SHAPE_RECOGNITION
X-Git-Tag: v1.4.1~7^2~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=13de13fcc64a32cb0f455ec3245251f98df0e990;p=modules%2Fhydro.git

Merge remote-tracking branch 'origin/BR_v14_rc' into BR_SHAPE_RECOGNITION

Conflicts:
	src/HYDROGUI/HYDROGUI_Shape.cxx
---

13de13fcc64a32cb0f455ec3245251f98df0e990
diff --cc src/HYDROGUI/HYDROGUI_Shape.cxx
index 60962d74,c430bb51..6f1f62f9
--- a/src/HYDROGUI/HYDROGUI_Shape.cxx
+++ b/src/HYDROGUI/HYDROGUI_Shape.cxx
@@@ -486,6 -485,6 +486,7 @@@ Handle_AIS_InteractiveObject HYDROGUI_S
    } else {
      return new AIS_Shape( myTopoShape );
    }
++  }
  }
  
  void HYDROGUI_Shape::buildShape()