Kévin Dietrich 94eb189752 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/BKE_blender_version.h

2018-02-24 14:02:50 +01:00

..

blender

Merge branch 'master' into blender2.8

2018-02-24 14:02:50 +01:00

blenderplayer

Fix bplayer (c)

2018-02-16 12:40:11 +01:00

creator

Merge branch 'master' into blender2.8

2018-02-21 10:51:58 +01:00

gameengine

Merge branch 'master' into blender2.8

2018-02-16 01:17:43 +11:00

tools @ b11375e890

Merge branch 'master' into blender2.8

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

CMakeLists.txt

…