Merge commit '667d3275589dac91b5bfe96f0244183007be6efd' into master-merge

diff --cc radiant/brush.h
Simple merge

diff --cc radiant/mainframe.cpp
Simple merge

diff --cc radiant/map.cpp
Simple merge

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

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

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

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