mano-wii 538475dec7 Merge branch 'master' of git@git.blender.org:blender.git into blender2.8 ...

# Conflicts:
#	source/blender/editors/transform/transform_snap_object.c

2017-07-11 13:54:08 -03:00

..

CMakeLists.txt

Fix compiling with Blenderplayer

2016-10-13 17:17:17 +02:00

stubs.c

Merge branch 'master' of git@git.blender.org:blender.git into blender2.8

2017-07-11 13:54:08 -03:00