NLA SoC: Merge from 2.5
authorJoshua Leung <aligorith@gmail.com>
Sun, 21 Jun 2009 00:01:37 +0000 (00:01 +0000)
committerJoshua Leung <aligorith@gmail.com>
Sun, 21 Jun 2009 00:01:37 +0000 (00:01 +0000)
21021 to 21042

1  2 
source/blender/editors/space_view3d/space_view3d.c
source/blender/makesrna/intern/rna_object.c