diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-10-22 11:55:16 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-10-22 11:55:16 +0300 |
| commit | 0e70feab22fd0871d61a03b43c591fb300990de7 (patch) | |
| tree | f95ce4dba82bd23b21dc5987be1babc4e0475fb1 /source/blender/gpu/intern/gpu_extensions.c | |
| parent | 91b768ccb1f42461668cea61fd1d72d64ab1d14a (diff) | |
| parent | 32d66889e992a82f3e56c0d43b06c0f4a89a08f7 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/windowmanager/intern/wm_init_exit.c
Diffstat (limited to 'source/blender/gpu/intern/gpu_extensions.c')
0 files changed, 0 insertions, 0 deletions