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/mysys/mf_same.c b/dep/mysqllite/mysys/mf_same.c
deleted file mode 100644
index 6738dc8051e..00000000000
--- a/dep/mysqllite/mysys/mf_same.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 */
-
-/* Kopierar biblioteksstrukturen och extensionen fr}n ett filnamn */
-
-#include "mysys_priv.h"
-#include <m_string.h>
-
-        /*
-	  Copy directory and/or extension between filenames.
-	  (For the meaning of 'flag', check mf_format.c)
-	  'to' may be equal to 'name'.
-	  Returns 'to'.
-	*/
-
-char * fn_same(char *to, const char *name, int flag)
-{
-  char dev[FN_REFLEN];
-  const char *ext;
-  size_t dev_length;
-  DBUG_ENTER("fn_same");
-  DBUG_PRINT("enter",("to: %s  name: %s  flag: %d",to,name,flag));
-
-  if ((ext=strrchr(name+dirname_part(dev, name, &dev_length),FN_EXTCHAR)) == 0)
-    ext="";
-
-  DBUG_RETURN(fn_format(to,to,dev,ext,flag));
-} /* fn_same */