Nay 9c26ce8da5 Merge branch 'master' into 4.x ...

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.h

2012-01-07 17:13:42 +00:00

..

CMakeLists.txt

Scripts/Commands: Added .dev command to show <Dev> tag in nickname

2011-09-21 11:35:29 -03:00

cs_account.cpp

Add Password change (Player level.) logs

2012-01-04 02:56:00 +02:00

cs_achievement.cpp

Update headers for 2012. HAPPY NEW YEAR!!!

2012-01-01 00:32:13 +01:00

cs_debug.cpp

Merge branch 'master' into 4.x

2012-01-07 17:13:42 +00:00

cs_event.cpp

Update headers for 2012. HAPPY NEW YEAR!!!

2012-01-01 00:32:13 +01:00

cs_gm.cpp

Merge branch 'master' into 4.x

2012-01-07 17:13:42 +00:00

cs_go.cpp

Update headers for 2012. HAPPY NEW YEAR!!!

2012-01-01 00:32:13 +01:00

cs_gobject.cpp

Update headers for 2012. HAPPY NEW YEAR!!!

2012-01-01 00:32:13 +01:00

cs_gps.cpp

Merge branch 'master' into 4.x

2012-01-07 17:13:42 +00:00

cs_honor.cpp

Update headers for 2012. HAPPY NEW YEAR!!!

2012-01-01 00:32:13 +01:00

cs_learn.cpp

Update headers for 2012. HAPPY NEW YEAR!!!

2012-01-01 00:32:13 +01:00

cs_misc.cpp

Update headers for 2012. HAPPY NEW YEAR!!!

2012-01-01 00:32:13 +01:00

cs_modify.cpp

Merge branch 'master' into 4.x

2012-01-07 17:13:42 +00:00

cs_npc.cpp

Update headers for 2012. HAPPY NEW YEAR!!!

2012-01-01 00:32:13 +01:00

cs_quest.cpp

Update headers for 2012. HAPPY NEW YEAR!!!

2012-01-01 00:32:13 +01:00

cs_reload.cpp

Core/Commands: Implemented .reload waypoint_data command. (requests from Aokromes.)

2012-01-05 20:31:12 +01:00

cs_tele.cpp

Update headers for 2012. HAPPY NEW YEAR!!!

2012-01-01 00:32:13 +01:00

cs_titles.cpp

Merge branch 'master' into 4.x

2012-01-07 17:13:42 +00:00

cs_wp.cpp

Core/DBLayer: Couple fixes

2012-01-02 20:29:22 +01:00