From: sbh <sergey.belash@opencascade.com>
Date: Wed, 9 Apr 2014 13:49:03 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom.git
X-Git-Tag: V_0.1~31
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=200f77f7819b363ecafeebbdec21dc6d1d0f8e0b;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom.git
---

200f77f7819b363ecafeebbdec21dc6d1d0f8e0b
diff --cc src/XGUI/CMakeLists.txt
index 078e6aa4f,e740fea8d..e1993f5d9
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@@ -60,10 -60,10 +60,11 @@@ SET(PROJECT_LIBRARIE
  	opengl32
      Event
      Config
 -	${Qt5Widgets_LIBRARIES}
 +	${QT_LIBRARIES}
 +	${QT_QTMAIN_LIBRARY}
  	${CAS_VIEWER}
  	${CAS_KERNEL}
+     ${CAS_OCAF}
  	PyConsole
  	PyInterp
  	PyEvent