diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-12 13:38:54 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-12 13:38:54 +0300 |
| commit | c98b2e74df2e531726f5ceabe76342282f695f23 (patch) | |
| tree | b1ce1ce48658847da18ee13550583e661b194ec6 /source/blender/collada | |
| parent | fdd26faa49f056702b63a3b60d0da051c3f77c68 (diff) | |
| parent | 5508b572ea9bb2d3b758cae6898035005e8ebb2a (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
Diffstat (limited to 'source/blender/collada')
0 files changed, 0 insertions, 0 deletions