Blender Git Commit Log

Git Commits -> Revision 8135cc9

Revision 8135cc9 by Tamito Kajiyama (master)
June 10, 2012, 20:50 (GMT)
Merged changes in the trunk up to revision 47700.

Conflicts resolved:
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/windowmanager/WM_types.h

Commit Details:

Full Hash: 8135cc9f954e0d63ab3e97d4a7c52ff5e573eef0
SVN Revision: 47706
Parent Commits: 0f33d57, 298feff

By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021