diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-02 17:50:28 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-02 17:50:28 +0300 |
| commit | 1d930382e67e4779b3c87ccdd311a043b89ca107 (patch) | |
| tree | bad5228d039bdc8b5589f72bd86aad5526f52b23 /source/blender/editors/space_sequencer/sequencer_add.c | |
| parent | 67403e32af9ad23cadea82b856075904557635cd (diff) | |
| parent | 2723d107046846bc6ab2ae458c3371cdb7c441bf (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/makesdna/DNA_object_types.h
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_add.c')
0 files changed, 0 insertions, 0 deletions