CMakeLists.txt edited online with Bitbucket - remove merge conflict with default branche

--HG--
branch : ig_elevaton_port_to_linux

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)