Julian Eisel b557ceb2c1 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/space_outliner/outliner_draw.c
	source/blender/editors/space_outliner/outliner_edit.c
	source/blender/editors/space_outliner/outliner_intern.h
	source/blender/editors/space_outliner/outliner_select.c

2016-10-16 15:33:00 +02:00

..

blender

Merge branch 'master' into blender2.8

2016-10-16 15:33:00 +02:00

blenderplayer

Fix compiling with Blenderplayer

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

creator

GPU_basic_shader uses GLSL by default

2016-09-21 20:24:02 +02:00

gameengine

BGE: remove calls to GLSL support query (it's always supported)

2016-10-10 01:19:10 -04:00

tools @ 896c5f7895

Point submodules to latest master branches

2016-09-02 11:44:22 +02:00

CMakeLists.txt

Move tests into tests/ top-level dir

2014-06-18 22:03:46 +10:00