From: gdd Date: Tue, 8 Nov 2011 14:01:51 +0000 (+0000) Subject: rnc: fix error introduced by my merge operation X-Git-Tag: pxsxl1~29 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b94bff35804ffc4830198803b5050d5b75a73f4c;p=modules%2Fgui.git rnc: fix error introduced by my merge operation --- diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.cxx b/src/OCCViewer/OCCViewer_ViewPort3d.cxx index 7419c10a7..7c4cda7e4 100755 --- a/src/OCCViewer/OCCViewer_ViewPort3d.cxx +++ b/src/OCCViewer/OCCViewer_ViewPort3d.cxx @@ -42,10 +42,6 @@ #include #include -#include -#include -#include - #include "utilities.h" #if defined WNT diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.h b/src/OCCViewer/OCCViewer_ViewPort3d.h index 985126bb4..ea977007b 100755 --- a/src/OCCViewer/OCCViewer_ViewPort3d.h +++ b/src/OCCViewer/OCCViewer_ViewPort3d.h @@ -65,8 +65,6 @@ public: virtual void updateStaticTriedronVisibility(); - virtual void updateStaticTriedronVisibility(); - // void setActive( V3d_TypeOfView ); virtual bool syncronize( const OCCViewer_ViewPort3d* );