diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-10-12 17:40:35 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-10-12 17:40:35 +0300 |
| commit | 557dc7d34353992058451851a6ec1068d25b13d4 (patch) | |
| tree | 8c86daa924fdf1d8c82fb0236789b3160e016755 /source/blender/editors/scene | |
| parent | 5f025a7e5e043a2dbdebf66668217fbae591ef89 (diff) | |
| parent | a51688d0b066f00d5912d677d0f4bdad08b28ea6 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/screen/screen_edit.c
Diffstat (limited to 'source/blender/editors/scene')
0 files changed, 0 insertions, 0 deletions