diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2010-08-16 13:37:08 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2010-08-16 13:37:08 +0400 |
| commit | 2b7a774ab0dfd3bc66240b387a586b5122ab2661 (patch) | |
| tree | 11b863eb5c0a138dbfbc8b65d42d2724ddc80946 /source/blender/editors/space_nla | |
| parent | 02314f11d83f4ee7e0b2d3f052d36ac492cfc910 (diff) | |
| parent | a91d538f47171a40463016b91c22d39d694d923a (diff) | |
svn merge -r 31314:31370 https://svn.blender.org/svnroot/bf-blender/trunk/blendersoc-2010-nexyon
Diffstat (limited to 'source/blender/editors/space_nla')
| -rw-r--r-- | source/blender/editors/space_nla/nla_buttons.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_nla/nla_channels.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_nla/nla_draw.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_nla/nla_ops.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index e31d7635f7a..86f783733b5 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -44,7 +44,6 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "BIF_gl.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index d834fb07ee7..b00cba676d0 100644 --- a/source/blender/editors/space_nla/nla_channels.c +++ b/source/blender/editors/space_nla/nla_channels.c @@ -35,7 +35,6 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_math.h" diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c index 2568baf0f0a..f489fc4774f 100644 --- a/source/blender/editors/space_nla/nla_draw.c +++ b/source/blender/editors/space_nla/nla_draw.c @@ -37,7 +37,6 @@ #include "DNA_space_types.h" #include "DNA_windowmanager_types.h" -#include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_math.h" diff --git a/source/blender/editors/space_nla/nla_ops.c b/source/blender/editors/space_nla/nla_ops.c index 9c7eee39e29..85a169f2bb0 100644 --- a/source/blender/editors/space_nla/nla_ops.c +++ b/source/blender/editors/space_nla/nla_ops.c @@ -31,7 +31,6 @@ #include "DNA_scene_types.h" -#include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_math.h" |