Merge commit 'bf803dd851539f0d5f806f12a1e2ab93fdddae08' into garux-merge

diff --cc Makefile
index 009a3d066b1269d01427b04d3620b308f0a709e6,e2d56e38d9a293ee72a71980b71d9983617dd295..f71d2784641d23adb2ef06e8a57be329e4222a89
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -489,9 -482,9 +489,9 @@@ endi
  %.o: %.c $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) | dependencies-check
        $(CC) $< $(CFLAGS) $(CFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(CPPFLAGS_COMMON) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@
  
- 
+ $(INSTALLDIR)/q3map2.$(EXE): LDFLAGS_EXTRA := -Wl,--large-address-aware
 -$(INSTALLDIR)/q3map2.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG) $(LIBS_JPEG) $(LIBS_ZLIB)
 -$(INSTALLDIR)/q3map2.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_PNG) $(CPPFLAGS_JPEG) -Itools/quake3/common -Ilibs -Iinclude
 +$(INSTALLDIR)/q3map2.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG) $(LIBS_JPEG) $(LIBS_WEBP) $(LIBS_ZLIB)
 +$(INSTALLDIR)/q3map2.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_PNG) $(CPPFLAGS_JPEG) $(CPPFLAGS_WEBP) -Itools/quake3/common -Ilibs -Iinclude
  $(INSTALLDIR)/q3map2.$(EXE): \
        tools/quake3/common/cmdlib.o \
        tools/quake3/common/imagelib.o \

diff --cc libs/mathlib/mathlib.c
Simple merge

diff --cc radiant/brushmanip.cpp
Simple merge

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

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

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

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

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

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

diff --cc tools/quake3/q3map2/q3map2.h
index 13496b977afecf8e1f456ab324653fecc5c94321,c819d38ba4340d8fd55229399de293ea5c22ad33..7f132007ca33ed057b6f0ba3bd853b7999fdcd3f
--- 1/tools/quake3/q3map2/q3map2.h
--- 2/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@@ -2030,10 -2001,11 +2030,11 @@@ Q_EXTERN float jitters[ MAX_JITTERS ]
  
  /*can't code*/
  Q_EXTERN qboolean doingBSP Q_ASSIGN( qfalse );
- 
+ Q_EXTERN qboolean doingModelClip Q_ASSIGN( qfalse );
+ Q_EXTERN qboolean snapModelClip Q_ASSIGN( qfalse );
  
  /* commandline arguments */
 -Q_EXTERN qboolean                     nocmdline Q_ASSIGN( qfalse );
 +Q_EXTERN qboolean nocmdline Q_ASSIGN( qfalse );
  Q_EXTERN qboolean verbose;
  Q_EXTERN qboolean verboseEntities Q_ASSIGN( qfalse );
  Q_EXTERN qboolean force Q_ASSIGN( qfalse );