Merged changes in the trunk up to revision 43881.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 4 Feb 2012 14:22:05 +0000 (14:22 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 4 Feb 2012 14:22:05 +0000 (14:22 +0000)
12 files changed:
1  2 
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeoutput.c
source/blender/windowmanager/intern/wm_files.c

Simple merge