svn merge -r39433:39493 https://svn.blender.org/svnroot/bf-blender/trunk/blender

diff --cc intern/ghost/intern/GHOST_SystemSDL.cpp
index 6f6679b8d8c02ff8339b00b8f0a3749e9d5fd927,f2cc45731fa0c5a7b2dbed0910bc9bbf71d07e8c..12669ed1a19c4900feb879d4de5b4b2dad2ed286
mode 100755,100644..100755
--- 1/intern/ghost/intern/GHOST_SystemSDL.cpp
--- 2/intern/ghost/intern/GHOST_SystemSDL.cpp
+++ b/intern/ghost/intern/GHOST_SystemSDL.cpp

diff --cc source/blender/blenkernel/intern/displist.c
Simple merge

diff --cc source/blender/editors/space_view3d/drawobject.c
Simple merge

diff --cc source/blender/editors/space_view3d/view3d_header.c
Simple merge

diff --cc source/blender/editors/space_view3d/view3d_select.c
Simple merge

diff --cc source/blender/python/mathutils/mathutils_Vector.c
Simple merge