diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2015-08-01 22:06:58 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2015-08-01 22:06:58 +0300 |
| commit | 4ade467fc6adfc13ce9e21d7e50b366fce70ea5f (patch) | |
| tree | 968418721b08baacd47bab95877bc08812f3046a /source/blender/blenkernel/intern/seqmodifier.c | |
| parent | 7759782ee7c4e654641c9f7abb51631c86e3f29c (diff) | |
| parent | a3c5de3e3ca82d8ad5a28029f3ee9207929318a1 (diff) | |
Merge branch 'master' into UI-graphical-redesign
Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_userdef_types.h
Diffstat (limited to 'source/blender/blenkernel/intern/seqmodifier.c')
0 files changed, 0 insertions, 0 deletions