NLA SoC: Merge from 2.5 20441 to 20570 (HEAD)
authorJoshua Leung <aligorith@gmail.com>
Tue, 2 Jun 2009 01:40:53 +0000 (01:40 +0000)
committerJoshua Leung <aligorith@gmail.com>
Tue, 2 Jun 2009 01:40:53 +0000 (01:40 +0000)
commit37f47ef3862a85d4d95fe5b18ab3d6b9c88ccdd3
treea648a61fbbc313c2833a5e4eb3c8d8d75da3c090
parent33267f58581ea8f9d89028958c6e64a8d048d4db
parenta117731aa23c25d699c405325c7bb7ac5680a5e7
NLA SoC: Merge from 2.5   20441 to 20570 (HEAD)

There were a few conflicts/missing files. Hopefully everything updated ok...
16 files changed:
release/ui/buttons_data_modifier.py
source/blender/blenkernel/intern/fcurve.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/UI_interface.h
source/blender/editors/include/UI_view2d.h
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_api.c
source/blender/editors/interface/interface_utils.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/interface/view2d.c
source/blender/editors/object/object_modifier.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/makesdna/DNA_anim_types.h
source/blender/makesrna/intern/rna_constraint.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_ui.c