araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-19 06:29:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_npc.cpp
This commit is contained in:
Vincent-Michael
2013-09-06 21:55:19 +02:00
parent d25c2e7f5b bc1a079b6c
commit be75ddc2bd
19 changed files with 280 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Commands/cs_debug.cpp
+1 -1
View File
@@ -265,7 +265,7 @@ public:
unit = player;
std::ifstream ifs("opcode.txt");
if (ifs.bad())
if (ifs.fail())
return false;
// remove comments from file