Merge commit 'ffb487e45c26dccd20285849979be1cb261c52f6' into master-merge

diff --cc Makefile
Simple merge

diff --cc tools/quake3/common/vfs.c
index d199d6c0400ebd6926d0d4c55e80566b1ca881c8,ed4c1f6129a45fc71eacd3125b46b35bec615de5..02fd1f78cd1bc579822556a9c90acfc188852a98
--- 1/tools/quake3/common/vfs.c
--- 2/tools/quake3/common/vfs.c
+++ b/tools/quake3/common/vfs.c
@@@ -50,8 -50,12 +50,12 @@@
  #include "mathlib.h"
  #include "inout.h"
  #include "vfs.h"
 -#include <minizip/unzip.h>
 +#include <unzip.h>
  #include <glib.h>
+ #define BAD_MINIZ
+ #ifndef BAD_MINIZ
+ #include "miniz.h"
+ #endif
  
  typedef struct
  {

diff --cc tools/quake3/common/vfs.h
Simple merge

diff --cc tools/quake3/q3map2/bspfile_abstract.c
Simple merge

diff --cc tools/quake3/q3map2/main.c
index 2a95c44ceb475f0b862b5f540c02a6f67eb10490,ee3f63e78999479f750cc79ccc32c1964ebdd4ea..9f28fdf75048afd8e53f4acce83000b5beefda81
--- 1/tools/quake3/q3map2/main.c
--- 2/tools/quake3/q3map2/main.c
+++ b/tools/quake3/q3map2/main.c
@@@ -388,8 -1053,11 +1059,11 @@@ int main( int argc, char **argv )
  
        Sys_Printf( "Q3Map         - v1.0r (c) 1999 Id Software Inc.\n" );
        Sys_Printf( "Q3Map (ydnar) - v" Q3MAP_VERSION "\n" );
 -      Sys_Printf( "NetRadiant    - v" RADIANT_VERSION " " __DATE__ " " __TIME__ "\n" );
 +      Sys_Printf( RADIANT_NAME "    - v" RADIANT_VERSION " " __DATE__ " " __TIME__ "\n" );
        Sys_Printf( "%s\n", Q3MAP_MOTD );
+       Sys_Printf( "%s\n", argv[0] );
+ 
+       strcpy( q3map2path, argv[0] );//fuer autoPack func
  
        /* ydnar: new path initialization */
        InitPaths( &argc, argv );

diff --cc tools/quake3/q3map2/path_init.c
Simple merge

diff --cc tools/quake3/q3map2/q3map2.h
Simple merge

diff --cc tools/quake3/q3map2/shaders.c
Simple merge