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)
commit19c246ce5db212de788ae4b6f0396b9191971d7a
treeebb0dc36f8fb56e8a95acd00953d1717efd0d45e
parent6ff4a7229f316548046ab5593070b082cc1a4a7a
parent001dab25d448e5aea93f7ee7026eb52f3230b927
NLA SoC: Merge from 2.5

21021 to 21042
source/blender/editors/space_view3d/space_view3d.c
source/blender/makesrna/intern/rna_object.c