Bastien Montagne 557dc7d343 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/screen/screen_edit.c

2017-10-12 16:40:35 +02:00

..

blender

Merge branch 'master' into blender2.8

2017-10-12 16:40:35 +02:00

blenderplayer

Merge branch 'master' into blender2.8

2017-10-04 22:18:05 +05:00

creator

Merge branch 'master' into blender2.8

2017-10-10 01:36:36 +11:00

gameengine

Merge branch 'master' into blender2.8

2017-09-29 19:55:00 +10:00

tools @ b11375e890

Fix blurry icons

2017-01-29 17:21:57 +03:00

CMakeLists.txt

Fix WITH_LEGACY_OPENGL=ON

2017-04-08 12:01:29 +10:00