*Merge.

--HG--
branch : trunk

src/game/AchievementMgr.cpp

@@ -443,7 +443,7 @@ void AchievementMgr::SendAchievementEarned(AchievementEntry const* achievement)
     if(GetPlayer()->GetSession()->PlayerLoading())
         return;
 
-    #ifdef MANGOS_DEBUG
+    #ifdef TRINITY_DEBUG
     if((sLog.getLogFilter() & LOG_FILTER_ACHIEVEMENT_UPDATES)==0)
         sLog.outDebug("AchievementMgr::SendAchievementEarned(%u)", achievement->ID);
     #endif

src/game/CreatureEventAI.cpp

@@ -49,7 +49,7 @@ CreatureEventAI::CreatureEventAI(Creature *c ) : CreatureAI(c)
         {
 
             //Debug check
-            #ifndef MANGOS_DEBUG
+            #ifndef TRINITY_DEBUG
             if ((*i).event_flags & EFLAG_DEBUG_ONLY)
                 continue;
             #endif

src/game/WorldSession.cpp

@@ -130,7 +130,7 @@ void WorldSession::SendPacket(WorldPacket const* packet)
         sendLastPacketBytes = packet->wpos();               // wpos is real written size
     }
 
-    #endif                                                  // !MANGOS_DEBUG
+    #endif                                                  // !TRINITY_DEBUG
 
     if (m_Socket->SendPacket (*packet) == -1)
         m_Socket->CloseSocket ();