Blender Git Loki
Git Commits -> Revision 80e398e
Revision 80e398e by Tamito Kajiyama (master) November 8, 2011, 06:30 (GMT) |
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 |
Commit Details:
Full Hash: 80e398e7b2cfbdf0192b11734cb02b378b423d65
SVN Revision: 41644
Parent Commits: 72cfdfe, f086201