Tamito Kajiyama 80e398e7b2 Merged changes in the trunk up to revision 41638. ... Conflicts resolved: doc/python_api/sphinx_doc_gen.py source/blender/blenkernel/BKE_main.h source/blender/blenkernel/intern/library.c source/blender/blenloader/intern/readfile.c source/blender/blenloader/intern/writefile.c source/blender/editors/include/UI_resources.h source/blender/editors/interface/resources.c source/blender/makesdna/DNA_ID.h source/blender/makesdna/intern/makesdna.c source/blender/makesrna/intern/rna_internal.h source/blender/makesrna/intern/rna_main.c source/blender/makesrna/intern/rna_main_api.c source/blender/makesrna/intern/rna_scene.c		2011-11-08 06:30:02 +00:00
..
bl_operators	Merged changes in the trunk up to revision 41638.	2011-11-08 06:30:02 +00:00
bl_ui	Merged changes in the trunk up to revision 41638.	2011-11-08 06:30:02 +00:00
keyingsets_builtins.py	svn merge -r41171:41170 . --- fix coming next	2011-10-21 08:31:28 +00:00