blender/release/scripts/startup
Tamito Kajiyama 353713afe8 Merged changes in the trunk up to revision 40096.
Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/CMakeLists.txt

Note for branch builders: Enabling Blender Player may cause linker errors.
2011-09-10 13:36:27 +00:00
..
bl_operators Merged changes in the trunk up to revision 40096. 2011-09-10 13:36:27 +00:00
bl_ui Merged changes in the trunk up to revision 40096. 2011-09-10 13:36:27 +00:00
keyingsets_builtins.py minor edits, pep8 - also correct float -> double promotion for blf. 2011-08-30 10:49:58 +00:00