diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2015-03-30 15:41:05 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2015-03-30 15:41:05 +0300 |
| commit | 0a93cd9eee6b9716c5337d6725829fa37949b3c2 (patch) | |
| tree | b76ebf03e01b5b1fb6c2d33b205f62a65ca89d9b /source/blender/editors/space_sequencer/sequencer_intern.h | |
| parent | 04fe09b216a6acc3f1f665287c4e0914a6014a52 (diff) | |
| parent | 590efaacb862aa4352b11e77d37805df5445a90f (diff) | |
Merge branch 'master' into wiggly-widgets
Conflicts:
source/blender/editors/include/ED_transform.h
source/blender/gpu/intern/gpu_buffers.c
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_intern.h')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_intern.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h index 37b801d0743..63ae52c3207 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@ -45,7 +45,6 @@ struct ARegion; struct ARegionType; struct Scene; struct Main; -struct SequencePreview; /* space_sequencer.c */ struct ARegion *sequencer_has_buttons_region(struct ScrArea *sa); |