Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-14 22:19:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into mmaps

Browse Source 
Conflicts:
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
This commit is contained in:
Nay
2012-09-04 19:11:04 +01:00
parent c0b031af4d 73172c67f0
commit 36b3e06a7e
21 changed files with 535 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/map_extractor/CMakeLists.txt
View File

@@ -43,5 +43,5 @@ add_dependencies(mapextractor mpq)
if( UNIX )
install(TARGETS mapextractor DESTINATION bin)
elseif( WIN32 )
install(TARGETS mapextractor DESTINATION "${CMAKE_INSTALL_PREFIX}")
install(TARGETS mapextractor DESTINATION "${CMAKE_INSTALL_PREFIX}")
endif()