Merge commit '9c4c8b725fdca551dc9379b77ebd9c498d0c6f28' into master-merge

diff --cc Makefile
Simple merge

diff --cc radiant/brushmanip.cpp
index 77baf50e40a55041a3654ead1ce92410fc56a3f2,d73450a5cc330e5a59c40c47f0a469f7b4877ee4..d424bb2be84874bb3ae9b3a52aa20731457cfc68
--- 1/radiant/brushmanip.cpp
--- 2/radiant/brushmanip.cpp
+++ b/radiant/brushmanip.cpp
@@@ -939,9 -939,9 +942,10 @@@ void BrushFilters_construct()
        add_face_filter( g_filter_face_caulk_ja, EXCLUDE_CAULK );
        add_brush_filter( g_filter_brush_liquids, EXCLUDE_LIQUIDS );
        add_brush_filter( g_filter_brush_hint, EXCLUDE_HINTSSKIPS );
+       add_brush_filter( g_filter_brush_hintlocal, EXCLUDE_HINTSSKIPS );
        add_brush_filter( g_filter_brush_hint_q2, EXCLUDE_HINTSSKIPS );
        add_brush_filter( g_filter_brush_hint_ja, EXCLUDE_HINTSSKIPS );
 +      add_brush_filter( g_filter_brush_subtlehint, EXCLUDE_HINTSSKIPS );
        add_brush_filter( g_filter_brush_clusterportal, EXCLUDE_CLUSTERPORTALS );
        add_brush_filter( g_filter_brush_visportal, EXCLUDE_VISPORTALS );
        add_brush_filter( g_filter_brush_areaportal, EXCLUDE_AREAPORTALS );

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/map.c
Simple merge

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

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