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, 40 deletions

diff --git a/dep/mysqllite/strings/llstr.c b/dep/mysqllite/strings/llstr.c
deleted file mode 100644
index 643cf36a311..00000000000
--- a/dep/mysqllite/strings/llstr.c
+++ /dev/null
@@ -1,40 +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 */
-
-/*
-  Defines: llstr();
-
-  llstr(value, buff);
-
-  This function saves a longlong value in a buffer and returns the pointer to
-  the buffer.  This is useful when trying to portable print longlong
-  variables with printf() as there is no usable printf() standard one can use.
-*/
-
-
-#include <my_global.h>
-#include "m_string.h"
-
-char *llstr(longlong value,char *buff)
-{
-  longlong10_to_str(value,buff,-10);
-  return buff;
-}
-
-char *ullstr(longlong value,char *buff)
-{
-  longlong10_to_str(value,buff,10);
-  return buff;
-}