Sybren A. Stüvel 405980b1fa Merge branch 'master' into blender2.8 ...

# Conflicts:
#	source/blender/alembic/intern/abc_exporter.cc
#	source/blender/alembic/intern/abc_exporter.h
#	source/blender/alembic/intern/alembic_capi.cc
#	tests/gtests/alembic/abc_export_test.cc

2017-10-29 15:38:55 +01:00

..

blender

Merge branch 'master' into blender2.8

2017-10-29 15:38:55 +01:00

blenderplayer

Move background images into the camera

2017-10-26 22:02:40 +11:00

creator

Merge branch 'master' into blender2.8

2017-10-20 00:29:04 +11:00

gameengine

Workspace: Move engines to workspace and Properties Editor cleanup

2017-10-16 17:29:04 -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