]> SALOME platform Git repositories - modules/shaper.git/commit
Salome HOME
Merge remote-tracking branch 'remotes/origin/master'
authorazv <azv@opencascade.com>
Thu, 24 Jul 2014 12:37:34 +0000 (16:37 +0400)
committerazv <azv@opencascade.com>
Thu, 24 Jul 2014 12:37:34 +0000 (16:37 +0400)
commit3244e0f3d7e585ccfc3c37c56fbf5d6826055448
treeb322fd5cc01af91926b3c92a9aeb8dbfd03b7585
parent9d69918c6421ffae24534684847ec8b38741030a
parent0585d70db3ef47a9199910c3a05489a7b727782b
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
src/GeomAPI/GeomAPI_Shape.cpp
src/GeomAPI/GeomAPI_Shape.h
src/GeomAPI/GeomAPI_Shape.cpp
src/GeomAPI/GeomAPI_Shape.h