*Merge.

--HG-- branch : trunk
2009-02-18 11:36:19 -06:00
parent 017f309b5b 7bff1c1d60
commit 31637d4aac
2384 changed files with 9729 additions and 969 deletions
@@ -320,3 +320,4 @@ void ScriptedAI::DoGoHome()
        m_creature->GetMotionMaster()->MoveTargetedHome();
 }
 */
+
@@ -159,3 +159,4 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI
 };

 #endif
+
@@ -119,3 +119,4 @@ void AddSC_default()

    m_scripts[nrscripts++] = newscript;
 }
+
@@ -152,3 +152,4 @@ uint32 GetSkillLevel(Player *player,uint32 trskill)

    return TRADESKILL_LEVEL_NONE;
 }
+
@@ -96,3 +96,4 @@ extern uint32 GetSkillLevel(Player *player,uint32 skill);

 // -----------------------------------
 #endif
+
@@ -31,3 +31,4 @@
 #else
 #define TRINITY_DLL_EXPORT extern "C" export
 #endif
+
@@ -25,3 +25,4 @@ BOOL APIENTRY DllMain( HANDLE /*hModule*/, DWORD  /*ul_reason_for_call*/, LPVOID
    return true;
 }
 #endif
+