diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-05-06 16:31:57 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-05-06 16:31:57 +0300 |
| commit | f26b373cb922e79bce34eed7bdb7a8ee29a3dab4 (patch) | |
| tree | e1b2aad3353a3a7bced978eb74f78eb13a8cee3a /source/blender/editors/space_sequencer | |
| parent | ebcb8223bd886fd327cddae1394436e10f1f7a73 (diff) | |
| parent | 5ffd10a6da956210062f5cd18c61de348f379849 (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/editors/object/object_shapekey.c
Diffstat (limited to 'source/blender/editors/space_sequencer')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_scopes.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_scopes.c b/source/blender/editors/space_sequencer/sequencer_scopes.c index 404671cac84..c197aabedfd 100644 --- a/source/blender/editors/space_sequencer/sequencer_scopes.c +++ b/source/blender/editors/space_sequencer/sequencer_scopes.c @@ -29,7 +29,6 @@ #include <math.h> #include <string.h> -#include "BLI_math_color.h" #include "BLI_utildefines.h" #include "IMB_colormanagement.h" |