livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge error.

master
Nicky 2015-05-05 14:14:35 +02:00
parent a2199b1720
commit c73a5b51ea
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/CMakeLists.txt
View File

@ -2565,7 +2565,7 @@ if (PACKAGE)
set(VIEWER_COPY_MANIFEST copy_l_viewer_manifest)
endif (LINUX)
if( (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) )
if( RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING )
if(CMAKE_CFG_INTDIR STREQUAL ".")
set(LLBUILD_CONFIG ${CMAKE_BUILD_TYPE})
else(CMAKE_CFG_INTDIR STREQUAL ".")