update to trunk r14199

diff --cc intern/ghost/intern/GHOST_SystemX11.cpp
Simple merge

diff --cc source/blender/blenloader/intern/writefile.c
Simple merge

diff --cc source/blender/include/BIF_transform.h
Simple merge

diff --cc source/blender/makesdna/DNA_view3d_types.h
Simple merge

diff --cc source/blender/src/header_view3d.c
Simple merge

diff --cc source/blender/src/space.c
Simple merge

diff --cc source/blender/src/transform.c
Simple merge

diff --cc source/blender/src/view.c
Simple merge