diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-30 17:16:55 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-30 17:16:55 +0400 |
commit | e91f33101ff0999e07f7ce941f31dca793d954e7 (patch) | |
tree | 83c0d933f2ac1d063e2c57aaded58fd09d8d5712 /source/blender/editors/animation | |
parent | a42ba82f638e481d7fd3c3ed2ba05c331ef6717e (diff) | |
parent | 818b2e81da7d5f3e04439e3b4fef5c7ce5263b5b (diff) |
Merged changes in the trunk up to revision 50956.
Conflicts resolved:
source/blender/editors/interface/resources.c
Diffstat (limited to 'source/blender/editors/animation')
-rw-r--r-- | source/blender/editors/animation/anim_markers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index 270e7fc8f90..895aaec29da 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -504,7 +504,7 @@ static int ed_markers_poll_markers_exist(bContext *C) * "custom"/third-tier invoke() callback supplied as the last arg (which would normally * be the operator's invoke() callback elsewhere) * - * < invoke_func: (fn(bContext*, wmOperator*, wmEvent*)=int) "standard" invoke function + * < invoke_func: (fn(bContext *, wmOperator *, wmEvent *)=int) "standard" invoke function * that operator would otherwise have used. If NULL, the operator's standard * exec() callback will be called instead in the appropriate places. */ |