Blender Git Loki
Git Commits -> Revision c1ceab1
Revision c1ceab1 by Tamito Kajiyama (master) March 18, 2013, 00:48 (GMT) |
Merged changes in the trunk up to revision 55357. Resolved conflicts: release/datafiles/startup.blend source/blender/editors/space_nla/nla_buttons.c Also updated source/blender/blenkernel/intern/linestyle.c as a follow-up of recent changes for the use of bool. |
Commit Details:
Full Hash: c1ceab1281ccf061f03f8000bf190a082a5385d8
SVN Revision: 55365
Parent Commits: 0d9c98c, 66a35e0