conflict of CMakeList file resolved
7c6ddbee3949
Actions

Authored by Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch> on Jun 29 2015, 14:30.

Description

conflict of CMakeList file resolved

Committed

Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch>

Jun 29 2015, 14:30

Pushed

Parents

Branches

Unknown

Tags

Unknown

Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch> committed rAKA7c6ddbee3949: conflict of CMakeList file resolved (authored by Aurelia Cuba Ramos <aurelia.cubaramos@epfl.ch>).Jun 29 2015, 14:30

	Commit			Author	Details	Committed
	4b694cd2e859			Clement Roux	Split of the IGFEM mesh generation test and it CGAL part	Jun 25 2015

				Path
	M			test/test_igfem/CMakeLists.txt
	A			test/test_igfem/test_generation_igfem_mesh_from_sphere.cc
	P			test/test_igfem/test_geometry_triangle.msh Copied from test/test_igfem/test_solid_mechanics_model_igfem/patch_test.msh
	M			test/test_igfem/test_interpolate.cc