Bastien Montagne 50b67d83a9 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/makesrna/intern/rna_space.c

2017-05-10 20:40:31 +02:00

..

blender

Merge branch 'master' into blender2.8

2017-05-10 20:40:31 +02:00

blenderplayer

Merge branch 'master' into blender2.8

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

creator

Merge branch 'master' into blender2.8

2017-04-28 15:52:07 +02:00

gameengine

Merge branch 'master' into blender2.8

2017-05-03 18:33:02 +02: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