Bastien Montagne 9a43ebdd5b Fix more merge stupid leftover, and some build warnings.

2018-08-01 14:29: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

Merge branch 'blender2.8' into soc-2018-bevel

2018-08-01 14:16:41 +02:00

freedesktop

Linux: Add appdata.xml file for packagers

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

scripts

Fix more merge stupid leftover, and some build warnings.

2018-08-01 14:29:36 +02:00

text

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

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

windows

Merge branch 'master' into blender2.8

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