Tamito Kajiyama 4ea2fb8b0a Merged changes in the trunk up to revision 49478. ... Conflicts resolved: source/blender/blenkernel/intern/library.c source/blender/blenloader/intern/readfile.c source/blender/editors/interface/resources.c source/blender/makesrna/intern/rna_scene.c		2012-08-02 00:10:05 +00:00
..
blender_file_format	replace python3 command with python3.2, python3 isnt available on ubuntu.	2012-05-01 20:45:16 +00:00
build_systems	Spellfixes: colour -> color	2012-07-04 12:19:50 +00:00
doxygen	move bmesh wiki docs into bmesh header and update doxygen.	2012-02-27 20:27:19 +00:00
guides	Spellfixes: colour -> color	2012-07-04 12:19:50 +00:00
license	== docs ==	2010-10-13 14:44:22 +00:00
manpage	print names of nodes/sockets when cycles complains about only being able to connect a closure to another closure.	2012-07-19 13:04:43 +00:00
python_api	Merged changes in the trunk up to revision 49478.	2012-08-02 00:10:05 +00:00