Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	dep/PackageList.txt
	src/server/game/Spells/Auras/SpellAuras.cpp

1 files changed, 0 insertions, 32 deletions

diff --git a/dep/mysqllite/mysys/my_alarm.c b/dep/mysqllite/mysys/my_alarm.c
deleted file mode 100644
index d6a0da1bd13..00000000000
--- a/dep/mysqllite/mysys/my_alarm.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/* Function to set a varible when we got a alarm */
-/* Used by my_lock samt functions in m_alarm.h */
-
-
-#include "mysys_priv.h"
-#include "my_alarm.h"
-
-#ifdef HAVE_ALARM
-
-	/* ARGSUSED */
-sig_handler my_set_alarm_variable(int signo __attribute__((unused)))
-{
-  my_have_got_alarm=1;			/* Tell program that time expired */
-  return;
-}
-
-#endif /* HAVE_ALARM */