Nay 5ee22a8006 Merge remote-tracking branch 'origin/master' into 4.3.4 ...

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Commands/cs_misc.cpp

2012-09-04 19:08:22 +01:00

..

genrev

Update headers for 2012. HAPPY NEW YEAR!!!

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

server

Merge remote-tracking branch 'origin/master' into 4.3.4

2012-09-04 19:08:22 +01:00

tools

Misc: Convert from CRLF to LF in cs_misc.cpp

2012-09-04 16:14:15 +01:00

CMakeLists.txt

CMake: Updated year to 2012.

2012-01-07 23:10:50 +01:00