From 28f66efe307150558f4ad2546e058370a828be3e Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Fri, 5 Sep 2014 15:56:31 +0100
Subject: Revert "Temporarily commented out override directives."

This reverts commit 6db727c60c01264dc9a9c209c5b335da8f53cd64.

Conflicts:
	src/Bindings/PluginLua.h
	src/Blocks/BlockFire.h
	src/Generating/ChunkGenerator.h
	src/LoggerListeners.cpp
	src/Mobs/Components/AIAggressiveComponent.h
	src/Mobs/Monster.h
	src/OSSupport/IsThread.h
	src/Protocol/Authenticator.h
	src/UI/SlotArea.h
---
 src/Mobs/Squid.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Mobs/Squid.h')

diff --git a/src/Mobs/Squid.h b/src/Mobs/Squid.h
index 30f3afe23..edae5a16c 100644
--- a/src/Mobs/Squid.h
+++ b/src/Mobs/Squid.h
@@ -17,7 +17,7 @@ public:
 
 	CLASS_PROTODEF(cSquid)
 	
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) /*override*/;
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 } ;
 
 
-- 
cgit v1.2.3