Merged changes in the trunk up to revision 55700.

Conflicts resolved:
source/blender/editors/mesh/mesh_intern.h
This commit is contained in:
2013-04-01 13:47:19 +00:00
236 changed files with 5198 additions and 3560 deletions

File diff suppressed because it is too large Load Diff