NLA SoC: Merge from 2.5 - 21179 to 21209
authorJoshua Leung <aligorith@gmail.com>
Sun, 28 Jun 2009 03:26:10 +0000 (03:26 +0000)
committerJoshua Leung <aligorith@gmail.com>
Sun, 28 Jun 2009 03:26:10 +0000 (03:26 +0000)
commit500507ddb1efdf9f69d8a61e3d03a855ee017902
tree2a243c975661b12ff7e66289b714c71b7234f13e
parent61e30f0f001285dcbf0c7ec8ba44151544bfc8d9
parent7271f86be58d0705dd5abc01ac508e1775951fa8
NLA SoC: Merge from 2.5 - 21179 to 21209
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/view2d.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesrna/intern/rna_object.c