Blender Git Loki
Git Commits -> Revision 68ae82b
Revision 68ae82b by Tamito Kajiyama (master) January 21, 2012, 23:01 (GMT) |
Merged changes in the trunk up to revision 43585. Conflicts resolved: source/blender/editors/include/UI_resources.h source/blender/editors/interface/resources.c source/blender/makesrna/intern/rna_scene.c |
Commit Details:
Full Hash: 68ae82bb479a79de72cf174763f3244f64e28bb0
SVN Revision: 43587
Parent Commits: 3667cdd, b95beea