griefith/test

Go to file

Tamito Kajiyama 7db432d29d Merged changes in the trunk up to revision 39826.

Made a major amount of conflict resolution for code adaptation to
the animation system updates introduced in the Pepper branch recently
merged to the trunk.

Resolved conflicts:
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/library.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_nla/nla_channels.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_main_api.c

2011-09-03 20:48:43 +00:00

build_files

Merged changes in the trunk up to revision 39826.

2011-09-03 20:48:43 +00:00

doc

Merged changes in the trunk up to revision 39826.

2011-09-03 20:48:43 +00:00

extern

Fix #28154 : linux3-config.py doesn't exist

2011-08-21 13:31:46 +00:00

intern

typo fix: end of lines ;; --> ;