From 39948bd5c7bd748c0434f0c33f924de76520aa3c Mon Sep 17 00:00:00 2001 From: liria Date: Wed, 22 Jan 2014 23:49:11 +0000 Subject: [PATCH] CMakeLists.txt edited online with Bitbucket - remove merge conflict with default branche --- code/nel/tools/3d/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/nel/tools/3d/CMakeLists.txt b/code/nel/tools/3d/CMakeLists.txt index 52a69bd01..58360aec0 100644 --- a/code/nel/tools/3d/CMakeLists.txt +++ b/code/nel/tools/3d/CMakeLists.txt @@ -3,7 +3,6 @@ SUBDIRS( build_far_bank build_smallbank ig_lighter - ig_elevation zone_dependencies zone_ig_lighter zone_lighter @@ -27,7 +26,7 @@ SUBDIRS( zviewer) IF(WIN32) -# ADD_SUBDIRECTORY(ig_elevation) + ADD_SUBDIRECTORY(ig_elevation) ADD_SUBDIRECTORY(lightmap_optimizer) IF(MFC_FOUND)