blender/release/scripts/startup
Tamito Kajiyama ac9ec06ec1 Merged changes in the trunk up to revision 54421.
Conflicts resolved:
release/datafiles/startup.blend
release/scripts/startup/bl_ui/properties_render.py
source/blender/SConscript
source/blender/blenloader/intern/readfile.c
2013-02-10 10:17:59 +00:00
..
bl_operators Merged changes in the trunk up to revision 54421. 2013-02-10 10:17:59 +00:00
bl_ui Merged changes in the trunk up to revision 54421. 2013-02-10 10:17:59 +00:00
keyingsets_builtins.py Adding Scale Visual keying (and de-duplicated part of the code returning visual values to key). 2012-12-23 10:51:48 +00:00