Bastien Montagne 4bf751be70 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/modifiers/intern/MOD_normal_edit.c
	source/blender/windowmanager/intern/wm_files.c

2018-06-14 12:39:52 +02:00

..

bin

Cleanup: spelling

2017-04-27 21:41:03 +10:00

darwin

set required MacOS version to 10.9

2017-03-16 15:02:55 -04:00

datafiles

UI: preset popover buttons in panel headers.

2018-06-13 15:22:34 +02:00

freedesktop

Linux: Add appdata.xml file for packagers

2018-02-08 15:59:16 +11:00

scripts

Merge branch 'master' into blender2.8

2018-06-14 12:39:52 +02:00

text

This copyright text (copied to binary distros) had a confusing statement about

2017-08-25 11:11:19 +02:00

windows

Remove Frame Server

2018-05-09 12:50:26 +02:00