Merge commit 'ed4c8c204443726e852a4c8927b3f8d2571cc522' into garux-merge

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

diff --cc tools/quake3/q3map2/exportents.c
index b123660843acfc4cdfc7a962bf5d96c6bdae2cbc,578f9e42fbcdf5caf2f35e8ac5400c1797cc5a95..a0e5d6b6c11d5e036add41268cd962935f3707c6
--- 1/tools/quake3/q3map2/exportents.c
--- 2/tools/quake3/q3map2/exportents.c
+++ b/tools/quake3/q3map2/exportents.c
@@@ -109,4 -109,4 +109,4 @@@ int ExportEntitiesMain( int argc, char 
                
          /* return to sender */
          return 0;
--}
++}

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

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

diff --cc tools/quake3/q3map2/path_init.c
index f8d978040ed5d6c22627ceb365dd31b81f2fc165,b953377a93234f46ab26618c2fe87a9e7b0016a1..66f256b48017a0c9033d214d7b53b59ec849c2c1
--- 1/tools/quake3/q3map2/path_init.c
--- 2/tools/quake3/q3map2/path_init.c
+++ b/tools/quake3/q3map2/path_init.c
@@@ -530,16 -507,17 +531,6 @@@ void InitPaths( int *argc, char **argv 
                        homeBasePath = ".";
                        argv[ i ] = NULL;
                }
--
--              /* -fs_pakpath */
--              else if ( strcmp( argv[ i ], "-fs_pakpath" ) == 0 ) {
--                      if ( ++i >= *argc ) {
--                              Error( "Out of arguments: No path specified after %s.", argv[ i - 1 ] );
--                      }
--                      argv[ i - 1 ] = NULL;
--                      AddPakPath( argv[ i ] );
--                      argv[ i ] = NULL;
--              }
 -
        }
  
        /* remove processed arguments */

diff --cc tools/quake3/q3map2/q3map2.h
index f6296f1b72aae3412f8dcd4c90c175d1503195a8,e6d0e1f73598189ec0e7bc498fd816cdcb27c428..a230dd002f019045f7ec6b7347f2afcf0c28b92a
--- 1/tools/quake3/q3map2/q3map2.h
--- 2/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@@ -1860,14 -1840,14 +1860,19 @@@ int                         ImportLight
  
  void                        SetupSurfaceLightmaps( void );
  void                        StitchSurfaceLightmaps( void );
 -void                        StoreSurfaceLightmaps( void );
 +void                        StoreSurfaceLightmaps( qboolean fastAllocate );
 +
 +
 +/* exportents.c */
 +void                        ExportEntities( void );
 +int                         ExportEntitiesMain( int argc, char **argv );
  
  
+ /* exportents.c */
+ void                        ExportEntities( void );
+ int                         ExportEntitiesMain( int argc, char **argv );
+ 
+ 
  /* image.c */
  void                        ImageFree( image_t *image );
  image_t                     *ImageFind( const char *filename );