From: vsv Date: Tue, 28 Oct 2014 17:30:28 +0000 (+0300) Subject: Merge branch 'master' of newgeom:newgeom X-Git-Tag: V_0.5~66^2~5 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6f7ce111d1694790c7b2ec920d49e926a7a50106;p=modules%2Fshaper.git Merge branch 'master' of newgeom:newgeom --- 6f7ce111d1694790c7b2ec920d49e926a7a50106 diff --cc src/ModuleBase/ModuleBase_Operation.cpp index 3f29da130,9f99fad51..896da097e --- a/src/ModuleBase/ModuleBase_Operation.cpp +++ b/src/ModuleBase/ModuleBase_Operation.cpp @@@ -21,8 -21,8 +21,9 @@@ #include #include #include +#include #include + #include #include