Bastien Montagne 0661bcba32 Merge branch 'blender2.7' ...

Conflicts:
	source/blender/windowmanager/intern/wm_operators.c

2018-12-27 23:33:42 +01: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.7'

2018-12-27 10:53:02 +01:00

freedesktop

Linux: Add appdata.xml file for packagers

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

scripts

Merge branch 'blender2.7'

2018-12-27 23:33:42 +01:00

text

readme: remove 'game creation'.

2018-11-09 11:51:40 +11:00

windows

Merge branch 'master' into blender2.8

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