araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-17 21:50:50 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
2e55abcde43c7e0aef3dda5cf896165491551031
TrinityCore/sql/updates
T
History
Spp 2e55abcde4 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
2012-10-19 14:24:11 +02:00
..
characters
DB: Add gm_tickets changes to base character db
2012-10-17 02:56:07 +02:00
world
Merge branch 'master' into 4.3.4
2012-10-19 14:24:11 +02:00