Merging r45936 through r46042 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 28 Apr 2012 18:27:32 +0000 (18:27 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 28 Apr 2012 18:27:32 +0000 (18:27 +0000)
commit38b80df618eb43df816e52d69dee4738782ea703
tree3673d10da96113a30923f0d3b4d8ef7207617488
parenta49a64b7108e1016d84c2063d7ea93b3e5a8cc54
parentf88cfd9168c2977fc4acc414d8709da6484e23e7
Merging r45936 through r46042 from trunk into soc-2011-tomato
y
release/datafiles/splash.png
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/datafiles/splash.png.c
source/blender/editors/datafiles/startup.blend.c
source/blender/editors/interface/resources.c
source/blender/editors/space_clip/clip_graph_ops.c
source/blender/editors/space_clip/clip_ops.c
source/blender/editors/space_clip/space_clip.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_files.c