araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-13 11:43:18 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
7ce02e7900c9682a35f77dfa873fefc59b5014d2
TrinityCore/sql/base/characters_database.sql
Vincent_Michael 7ce02e7900 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/CharacterHandler.cpp
2013-03-04 19:09:57 +01:00

92 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink