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

Conflicts:
	source/blender/editors/space_outliner/outliner_draw.c

2017-03-17 15:38:45 +01:00

..

blender

Merge branch 'master' into blender2.8

2017-03-17 15:38:45 +01:00

blenderplayer

fix blenderplayer build after moving Gawain to intern

2017-03-16 23:57:36 -04:00

creator

OpenGL: remove non-GLSL option from basic shader

2017-03-15 11:53:48 -04:00

gameengine

Merge branch 'master' into blender2.8

2017-03-16 15:42:49 +01:00

tools @ b11375e890

Fix blurry icons

2017-01-29 17:21:57 +03:00

CMakeLists.txt

Move tests into tests/ top-level dir

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