Bastien Montagne 04b8b1a167 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/intern/library_query.c

2018-03-20 11:33:59 +01:00

..

blender

Merge branch 'master' into blender2.8

2018-03-20 11:33:59 +01:00

blenderplayer

Merge branch 'master' into blender2.8

2018-03-19 18:14:05 +01:00

creator

Merge branch 'master' into blender2.8

2018-03-16 12:26:37 +01:00

gameengine

Merge branch 'master' into blender2.8

2018-03-10 06:55:39 +01:00

tools @ 7695e14cfc

Merge branch 'master' into blender2.8

2018-02-03 16:10:01 +01:00

CMakeLists.txt

Fix WITH_LEGACY_OPENGL=ON

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