Blender Git Commit Log
Git Commits -> Revision d165b36
Revision d165b36 by Joshua Leung (animsys2) December 15, 2008, 01:04 (GMT) |
AnimSys2: Resolving conflicts from merge Thanks Martin! |
Commit Details:
Full Hash: d165b362f25fe45f583d0db355db5b5fcff3c1be
SVN Revision: 17863
Parent Commit: 7a2e62f
Lines Changed: +37, -56
6 Modified Paths:
/SConstruct (+2, -2) (Diff)
/source/blender/blenkernel/BKE_blender.h (+0, -4) (Diff)
/source/blender/blenloader/intern/readfile.c (+8, -14) (Diff)
/source/blender/include/transform.h (+1, -4) (Diff)
/source/blender/makesdna/DNA_armature_types.h (+1, -4) (Diff)
/source/blender/src/editarmature.c (+25, -28) (Diff)
/source/blender/blenkernel/BKE_blender.h (+0, -4) (Diff)
/source/blender/blenloader/intern/readfile.c (+8, -14) (Diff)
/source/blender/include/transform.h (+1, -4) (Diff)
/source/blender/makesdna/DNA_armature_types.h (+1, -4) (Diff)
/source/blender/src/editarmature.c (+25, -28) (Diff)