diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-21 06:19:54 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-21 06:19:54 +0400 |
| commit | 9f243d531cb2629625d02e4290549b9e6ba76933 (patch) | |
| tree | c2ade62118995bb82bac30eb9efb874bbd4b286a /source/blender/editors/space_nla/nla_buttons.c | |
| parent | 7eae1db0597a2a82f86139c0069a2d4ff413837b (diff) | |
| parent | 89a5cf40e362756d92b440152c41e376feadad59 (diff) | |
Merged changes in the trunk up to revision 44288.
Conflicts resolved:
source/blender/blenkernel/intern/cdderivedmesh.c
Diffstat (limited to 'source/blender/editors/space_nla/nla_buttons.c')
| -rw-r--r-- | source/blender/editors/space_nla/nla_buttons.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index 9bacdf8327b..6086496b00b 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -42,7 +42,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_editVert.h" #include "BLI_rand.h" #include "BLF_translation.h" |