diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-04-18 14:18:49 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-04-18 14:18:49 +0300 |
| commit | 792f0aaad54631712de02df6b301e58ae3b59575 (patch) | |
| tree | 92fa5d6638072faa60da1b6490091f57abf81b12 /source/blender/editors/mesh/mesh_ops.c | |
| parent | bc6f68944885da097d20e94812bbac58ade5f985 (diff) | |
| parent | 8825a8e951c193ff855a1bbfb5a34ea93b8ccc55 (diff) | |
Merge branch 'master' into HMD_viewportHMD_viewport
Conflicts:
source/blender/editors/gpencil/gpencil_paint.c
Diffstat (limited to 'source/blender/editors/mesh/mesh_ops.c')
0 files changed, 0 insertions, 0 deletions