diff options
| author | Brian <runningnak3d@gmail.com> | 2010-07-01 09:06:56 -0600 |
|---|---|---|
| committer | Brian <runningnak3d@gmail.com> | 2010-07-01 09:06:56 -0600 |
| commit | d3e21eeb33ab1d4d874f3e2ca481ba6cd8f53b8a (patch) | |
| tree | 460e66be872a64c2c07b0f97898394f6de188358 /src | |
| parent | 38316ca97bee09412efe5f1b87e21bfb194232be (diff) | |
| parent | f3187e95019dfb94cb27e68a3954936cc35ec4eb (diff) | |
* Merge from public repo
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp index c13ee5f5585..adbd764e845 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp @@ -23,8 +23,8 @@ * if reached brann speaks through his radio.. */ -#include "ScriptedEscortAI.h" #include "ScriptPCH.h" +#include "ScriptedEscortAI.h" #include "ulduar.h" #include "Vehicle.h" diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp index ad6beb5ba51..d8fc0143b69 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp @@ -16,7 +16,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "ScriptedEscortAI.h" #include "ScriptPCH.h" #include "ulduar.h" |