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
..
blender_file_format	correct FSF address, as pointed out by Dave Plater	2011-06-21 05:01:54 +00:00
build_systems	Fix #28154: linux3-config.py doesn't exist	2011-08-21 13:31:46 +00:00
doxygen	change doxygen string to 2.59	2011-08-09 07:48:40 +00:00
guides	== docs ==	2010-10-13 14:44:22 +00:00
license	== docs ==	2010-10-13 14:44:22 +00:00
manpage	quiet 2 compiler warnings and update man page	2011-06-04 03:07:56 +00:00
python_api	Merged changes in the trunk up to revision 40096.	2011-09-10 13:36:27 +00:00