Blender Git Loki
Git Commits -> Revision 12b3733
Revision 12b3733 by Tianwei Shen (soc-2016-multiview) May 25, 2016, 16:24 (GMT) |
solve conflict between local and upstream |
Commit Details:
Full Hash: 12b3733462c1e97eca752e8ba3e5c9d8c4e6a2bc
Parent Commits: 35285ea, 5d27929