This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Bastien Montagne 885260117d Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenloader/intern/readfile.c
	source/blender/windowmanager/intern/wm_window.c

2017-03-28 10:41:10 +02:00

..

blender

Merge branch 'master' into blender2.8

2017-03-28 10:41:10 +02:00

blenderplayer

Merge branch 'master' into blender2.8

2017-03-25 13:39:47 +11:00

creator

OpenGL: remove non-GLSL option from basic shader

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

gameengine

convert last remaining GLU calls in BGE

2017-03-22 21:33:53 -04:00

tools @ b11375e890

Fix blurry icons

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

CMakeLists.txt

…