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
..
2011-11-05 08:40:07 +00:00
2011-11-08 06:30:02 +00:00
2011-11-06 16:38:21 +00:00
2011-11-03 06:53:52 +00:00
2011-07-15 04:01:47 +00:00
2011-02-04 09:35:20 +00:00
2011-10-10 21:15:11 +00:00
2011-11-01 20:14:58 +00:00