merge master

diff --cc src/HYDROData/HYDROData_Bathymetry.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_Channel.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_Polyline3D.cxx
Simple merge

diff --cc src/HYDRO_tests/CMakeLists.txt
index 07fa477d001eec583bb3747117774a20b1577ad5,07c05917aede7b15df4f99c2ada18b0ffb534611..35932e151eb2b824d0cc1a713eed597f66446447
--- 1/src/HYDRO_tests/CMakeLists.txt
--- 2/src/HYDRO_tests/CMakeLists.txt
+++ b/src/HYDRO_tests/CMakeLists.txt
@@@ -59,10 -59,10 +59,10 @@@ IF( ${WIN32} 
    add_definitions( -DWNT )
  ENDIF()
  
- SET( BOOST_INCLUDES $ENV{BOOST_ROOT}/include/boost-1_52 )
 -SET( CPPUNIT_INCLUDES $ENV{CPPUNIT_ROOT_DIR}/include )
 -SET( CAS_INCLUDES $ENV{CAS_ROOT_DIR}/inc )
 -SET( QT_INCLUDES $ENV{QT4_ROOT_DIR}/include $ENV{QT4_ROOT_DIR}/include/QtCore $ENV{QT4_ROOT_DIR}/include/QtGui $ENV{QT4_ROOT_DIR}/include/QtTest )
 +SET( CPPUNIT_INCLUDES $ENV{CPPUNIT_ROOT}/include )
 +SET( CAS_INCLUDES $ENV{CASROOT}/inc )
 +SET( QT_INCLUDES $ENV{QTDIR}/include $ENV{QTDIR}/include/QtCore $ENV{QTDIR}/include/QtGui $ENV{QTDIR}/include/QtTest )
+ SET( KERNEL_INCLUDES $ENV{KERNEL_ROOT_DIR}/include/salome )
  SET( GUI_INCLUDES $ENV{GUI_ROOT_DIR}/include/salome )
  SET( GEOM_INCLUDES $ENV{GEOM_ROOT_DIR}/include/salome )