Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 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 committed 2012-09-04 19:11:04 +01:00
2 parents c0b031af4d 73172c67f0
commit 36b3e06a7e
21 files changed
+535 -519
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/tools/map_extractor/CMakeLists.txt
+1 -1
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()