Bastien Montagne a43ebc63fa Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/intern/collision.c

2018-09-03 17:44:36 +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: add dedicated icon IDs for decorators, tool settings, shaderfx, overlays.

2018-08-30 17:56:54 +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-09-03 17:44:36 +02:00

text

Cleanup: Update some links to new wiki

2018-08-13 21:55:30 -04:00

windows

Merge branch 'master' into blender2.8

2018-06-17 20:37:10 +02:00