[Bf-blender-cvs] [6e13713078e] soc-2020-info-editor: Merge branch 'master' into soc-2020-info-editor

[Mateusz Grzeliński]

Commit: 6e13713078e4c953e994f3cc2cb072d2883afd4c
Author: Mateusz Grzeliński
Date:   Fri Jul 24 16:23:43 2020 +0200
Branches: soc-2020-info-editor
https://developer.blender.org/rB6e13713078e4c953e994f3cc2cb072d2883afd4c

Merge branch 'master' into soc-2020-info-editor

# Conflicts:
#	source/blender/windowmanager/intern/wm_init_exit.c

===================================================================



===================================================================