Changed "Combinated" to "Combined".

tests/CMakeLists.txt

@@ -3,6 +3,6 @@ cmake_minimum_required( VERSION 2.8 )
 add_subdirectory( "ImageModel" )
 add_subdirectory( "ConvexDiffraction" )
 add_subdirectory( "MeshModelList")
-add_subdirectory( "CombinatedModel")
+add_subdirectory( "CombinedModel")
 add_subdirectory( "UrbanDiffraction" )
 #add_subdirectory( "IndoorDiffraction" )
\ No newline at end of file

tests/CombinatedModel/CMakeLists.txt → tests/CombinedModel/CMakeLists.txt

@@ -15,11 +15,11 @@ if( ITA_GEOMETRICAL_ACOUSTICS_BUILD_STATIC )
 	add_definitions( -DITA_PROPAGATION_PATH_SIM_STATIC -DITA_GEO_STATIC )
 endif( )
 
-add_executable( CombinatedModelTest CombinatedModelTest.cpp )
-target_link_libraries( CombinatedModelTest ${VISTA_USE_PACKAGE_LIBRARIES} )
+add_executable( CombinedModelTest CombinedModelTest.cpp )
+target_link_libraries( CombinedModelTest ${VISTA_USE_PACKAGE_LIBRARIES} )
 
-vista_configure_app( CombinatedModelTest )
-vista_install( CombinatedModelTest )
-vista_create_default_info_file( CombinatedModelTest )
+vista_configure_app( CombinedModelTest )
+vista_install( CombinedModelTest )
+vista_create_default_info_file( CombinedModelTest )
 
-set_property( TARGET CombinatedModelTest PROPERTY FOLDER "ITAGeometricalAcoustics/Tests/ITAPropagationPathSim/CombinatedModel" )
+set_property( TARGET CombinedModelTest PROPERTY FOLDER "ITAGeometricalAcoustics/Tests/ITAPropagationPathSim/CombinatedModel" )