NLA SoC: Merge from 2.5
authorJoshua Leung <aligorith@gmail.com>
Wed, 10 Jun 2009 03:36:28 +0000 (03:36 +0000)
committerJoshua Leung <aligorith@gmail.com>
Wed, 10 Jun 2009 03:36:28 +0000 (03:36 +0000)
20669 to 20771

(sheesh, that took an hour, not including having to restart the whole process after TortoiseSVN bailed out midway through the first try)

1  2 
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/view2d.c
source/blender/editors/screen/screen_ops.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/makesrna.c

Simple merge