NLA SoC: Merge from 2.5 20215:20439 (HEAD)
authorJoshua Leung <aligorith@gmail.com>
Wed, 27 May 2009 00:07:03 +0000 (00:07 +0000)
committerJoshua Leung <aligorith@gmail.com>
Wed, 27 May 2009 00:07:03 +0000 (00:07 +0000)
commit95af39cc333c343511eec03c5c43e4c2368b1a1d
tree5e3b30830327abd7fed9cfc7701e59c3fc846237
parent801eeb6423f4fcd3f2b2fac73cc5e65c96654c5b
parentb89fb7d8fdea03549f0108554c5631b19f4be770
NLA SoC: Merge from 2.5 20215:20439 (HEAD)
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/DNA_space_types.h