svn merge ^/trunk/blender -r43693:43733
authorCampbell Barton <ideasman42@gmail.com>
Thu, 26 Jan 2012 19:20:33 +0000 (19:20 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 26 Jan 2012 19:20:33 +0000 (19:20 +0000)
commitde4eeb96946943289ac898525f09fc9c7afd4157
tree5887eac0f56db6ce226a25ae34eaaa1169c7ee3a
parentce90b472afbe4f90af60e19a0a6cc6704d3a3549
parent4514a4455be89bc0a789d78355321abe6cfd5112
svn merge ^/trunk/blender -r43693:43733
release/scripts/presets/keyconfig/maya.py
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/particle_system.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/space_view3d/view3d_select.c