diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-05-26 15:56:36 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-05-26 15:56:36 +0300 |
| commit | 322380999ed91179ebce511c7b14e470b48bf993 (patch) | |
| tree | c13a97f18bf388f0f4a2ad3f423764742b3f5bb9 /source/blender/editors/animation | |
| parent | 650fdcd74fecc14cdfdc0b2e17317f31807b6a40 (diff) | |
| parent | a23fbc71a1886e9f83fd1d6782050d5a8c356d13 (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/editors/object/object_ops.c
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_filter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index a47f5943d8a..7739848e0d4 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -1415,7 +1415,7 @@ static size_t animfilter_nla_controls(ListBase *anim_data, bDopeSheet *ads, Anim items += tmp_items; } - /* return the numebr of items added ot the list */ + /* return the numebr of items added to the list */ return items; } |