Nay 3375f56bf8 Merge remote-tracking branch 'origin/master' into 4.3.4 ...

Conflicts:
	src/server/scripts/Kalimdor/thousand_needles.cpp

2012-12-28 17:31:39 +00:00

..

achievement_scripts.cpp

Core/Misc: Set mode 0644 for files

2012-11-27 13:03:12 +01:00

areatrigger_scripts.cpp

Core: Remove Player.h dependency from all the possible headers

2012-11-17 05:18:37 +01:00

boss_emerald_dragons.cpp

Build fix

2012-11-24 00:48:21 +02:00

chat_log.cpp

Core/Misc: Set mode 0644 for files

2012-11-27 13:03:12 +01:00

CMakeLists.txt

Update forgotten copyright-headers for 2012.

2012-03-11 00:52:06 +05:00

go_scripts.cpp

scripts/gameobject: correct reset of gameobjects (cages/prisons), move command out of if statement

2012-11-30 18:57:56 +01:00

guards.cpp

Core/DB: Creature text for 22 script files

2012-12-07 10:04:40 +01:00

item_scripts.cpp

Merge branch 'master' into 4.3.4

2012-11-19 10:09:58 +01:00

mob_generic_creature.cpp

Core/Misc: Use proper headers to optimize compile

2012-07-30 05:38:40 +02:00

npc_innkeeper.cpp

Core/Misc: Reduce header dependencies - Step III

2012-11-20 15:03:56 +01:00

npc_professions.cpp

Merge branch 'master' into 4.3.4

2012-12-17 12:13:51 +01:00

npc_taxi.cpp

Core/Misc: Reduce header dependencies - Step III

2012-11-20 15:03:56 +01:00

npcs_special.cpp

Merge branch 'master' into 4.3.4

2012-12-19 08:23:34 +01:00