Bastien Montagne 749caf4984 Merge branch 'master' into blender2.8 ...

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

2018-02-07 21:54:52 +01:00

..

blender

Merge branch 'master' into blender2.8

2018-02-07 21:54:52 +01:00

blenderplayer

Fix bplayer (c)

2018-02-06 12:10:41 +01:00

creator

Merge branch 'master' into blender2.8

2018-02-02 14:15:29 +11:00

gameengine

Merge branch 'master' into blender2.8

2018-02-07 11:19:01 +11:00

tools @ b11375e890

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