araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-14 20:22:23 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
d4d43d74106bc3666175614bc7923b8b4e03bf50
TrinityCore/sql/updates
History
Vincent-Michael d4d43d7410 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Spells/SpellMgr.h
	src/server/game/World/World.cpp
2013-07-25 00:41:37 +02:00
..
characters
SQL: Rename in correct name
2013-07-19 14:01:25 +02:00
world
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-07-25 00:41:37 +02:00