Bastien Montagne 44f91a9a18 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenloader/intern/versioning_270.c

2017-05-22 22:49:02 +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

Merge branch 'master' into blender2.8

2017-05-08 00:19:22 +02:00

freedesktop

Update of our *nix .desktop file.

2015-08-27 16:31:13 +02:00

scripts

Merge branch 'master' into blender2.8

2017-05-22 22:49:02 +02:00

text

Use new manual URL

2017-01-23 19:10:37 -05:00

windows

move windows out of source dir

2016-02-07 20:58:58 +11:00