Merge remote-tracking branch 'ttimo/master'

Conflicts:
	config.py
	libs/missing.h
	plugins/model/cpicosurface.cpp
	plugins/vfspk3/unzip.cpp
	radiant/main.cpp
	radiant/mainframe.cpp
	radiant/mainframe.h
	radiant/missing.cpp
	radiant/pluginmanager.cpp
	radiant/preferences.cpp
	radiant/preferences.h
	tools/quake3/common/cmdlib.c
	tools/quake3/common/unzip.c
	tools/quake3/q3map2/image.c

diff --cc tools/quake3/common/cmdlib.c
Simple merge

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

diff --cc tools/quake3/common/unzip.c
index c35755ac62e7facb15d533dac30f8e0dea6b6870,61598d71fcde54b35ccbd56e0a0e91c20a1ff6a9..071074976bed8c987ea3a12c2d0e34ba301c4f08
--- 1/tools/quake3/common/unzip.c
--- 2/tools/quake3/common/unzip.c
+++ b/tools/quake3/common/unzip.c
@@@ -1239,20 -1257,19 +1257,21 @@@ static int unzlocal_getByte(FILE *fin,i
          else
              return UNZ_EOF;
      }
-    }
-  */
+ }
+ */
  
  /* ===========================================================================
-    Reads a long in LSB order from the given gz_stream. Sets
-  */
- static int unzlocal_getShort( FILE* fin, uLong *pX ){
-       short v;
+    Reads a long in LSB order from the given gz_stream. Sets 
+ */
+ static int unzlocal_getShort (FILE* fin, uLong *pX)
+ {
+       short   v;
  
 -      fread( &v, sizeof(v), 1, fin );
 +      if ( fread( &v, sizeof( v ), 1, fin ) != 1 ) {
 +              return UNZ_EOF;
 +      }
  
-       *pX = __LittleShort( v );
+       *pX = __LittleShort( v);
        return UNZ_OK;
  
  /*
@@@ -1266,23 -1283,22 +1285,24 @@@
      if (err==UNZ_OK)
          err = unzlocal_getByte(fin,&i);
      x += ((uLong)i)<<8;
- 
+    
      if (err==UNZ_OK)
-    *pX = x;
+         *pX = x;
      else
-    *pX = 0;
+         *pX = 0;
      return err;
-  */
+ */
  }
  
- static int unzlocal_getLong( FILE *fin, uLong *pX ){
-       int v;
+ static int unzlocal_getLong (FILE *fin, uLong *pX)
+ {
+       int             v;
  
 -      fread( &v, sizeof(v), 1, fin );
 +      if ( fread( &v, sizeof( v ), 1, fin ) != 1 ) {
 +              return UNZ_EOF;
 +      }
  
-       *pX = __LittleLong( v );
+       *pX = __LittleLong( v);
        return UNZ_OK;
  
  /*

diff --cc tools/quake3/q3map2/image.c
index 8ac3c6cee8efa8fb867831217c11f6249210f032,2af46a6f7721761f3b2f30f68e95471d46481751..5ab1d48b1c1a4799b295564851401d751a93a6e0
--- 1/tools/quake3/q3map2/image.c
--- 2/tools/quake3/q3map2/image.c
+++ b/tools/quake3/q3map2/image.c
@@@ -97,9 -97,8 +97,8 @@@ static void LoadDDSBuffer( byte *buffer
  typedef struct pngBuffer_s
  {
        byte    *buffer;
 -      int size, offset;
 +      png_size_t size, offset;
- }
- pngBuffer_t;
+ } pngBuffer_t;
  
  void PNGReadData( png_struct *png, png_byte *buffer, png_size_t size ){
        pngBuffer_t     *pb = (pngBuffer_t*) png_get_io_ptr( png );