*Merge.

--HG--
branch : trunk

4 files changed, 11 insertions, 11 deletions

diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp
index 2ae7072dee1..10b23ba1b47 100644
--- a/src/bindings/scripts/ScriptMgr.cpp
+++ b/src/bindings/scripts/ScriptMgr.cpp
@@ -1690,7 +1690,7 @@ TRINITY_DLL_EXPORT
 bool GOSelect( Player *player, GameObject *_GO, uint32 sender, uint32 action )
 {
     if(!_GO)
-	return false;
+    return false;
     debug_log("TSCR: Gossip selection, sender: %d, action: %d",sender, action);
 
     Script *tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId];
@@ -1704,7 +1704,7 @@ TRINITY_DLL_EXPORT
 bool GOSelectWithCode( Player *player, GameObject *_GO, uint32 sender, uint32 action, const char* sCode )
 {
     if(!_GO)
-	return false;
+    return false;
     debug_log("TSCR: Gossip selection, sender: %d, action: %d",sender, action);
 
     Script *tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId];
diff --git a/src/bindings/scripts/scripts/go/go_scripts.cpp b/src/bindings/scripts/scripts/go/go_scripts.cpp
index 969c7ea69ee..eea2e40a1af 100644
--- a/src/bindings/scripts/scripts/go/go_scripts.cpp
+++ b/src/bindings/scripts/scripts/go/go_scripts.cpp
@@ -190,7 +190,7 @@ bool GOHello_go_tablet_of_the_seven(Player *player, GameObject* _GO)
 bool GOHello_go_jump_a_tron(Player *player, GameObject* _GO)
 {
     if (player->GetQuestStatus(10111) == QUEST_STATUS_INCOMPLETE)
- 	player->CastSpell(player,33382,true);
+     player->CastSpell(player,33382,true);
 
     return true;
 }
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h
index 39db5bed06a..3253a384217 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h
@@ -13,7 +13,7 @@
 #define TYPE_THRALL_PART4     6
 #define DATA_THRALL           7
 #define DATA_TARETHA          8
-#define DATA_EPOCH	      9
+#define DATA_EPOCH          9
 #define WORLD_STATE_OH        2436
 #endif
 
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
index 8b0a62c4452..d03d53cd397 100644
--- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
+++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
@@ -28,7 +28,7 @@ EndScriptData */
 
 #define THRALL_ENTRY    17876
 #define TARETHA_ENTRY   18887
-#define EPOCH_ENTRY	18096
+#define EPOCH_ENTRY    18096
 
 #define DRAKE_ENTRY             17848
 
@@ -53,7 +53,7 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
         mThrallEventCount   = 0;
         ThrallGUID          = 0;
         TarethaGUID         = 0;
-	EpochGUID	    = 0;
+    EpochGUID        = 0;
 
         for(uint8 i = 0; i < ENCOUNTERS; i++)
             Encounter[i] = NOT_STARTED;
@@ -106,9 +106,9 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
             case TARETHA_ENTRY:
                 TarethaGUID = creature->GetGUID();
                 break;
-	    case EPOCH_ENTRY:
-		EpochGUID = creature->GetGUID();
-		break;
+        case EPOCH_ENTRY:
+        EpochGUID = creature->GetGUID();
+        break;
         }
     }
 
@@ -222,8 +222,8 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
                 return ThrallGUID;
             case DATA_TARETHA:
                 return TarethaGUID;
-	    case DATA_EPOCH:
-		return EpochGUID;
+        case DATA_EPOCH:
+        return EpochGUID;
         }
         return 0;
     }