Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps

Browse Source 
Conflicts:
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
This commit is contained in:
Vincent_Michael committed 2013-01-01 23:12:21 +01:00
2 parents 234f097120 01b705c844
commit 62adbdab99
1184 files changed
+2134 -1418
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/shared/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
# Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without