[Bf-blender-cvs] [160bdf6] hair_system: Merge branch 'hair_immediate_fixes' into hair_system_solver

[Lukas Tönne]

Commit: 160bdf68ccbbafa4cc1057f6df4c770a51ad6650
Author: Lukas Tönne
Date:   Wed Oct 1 10:53:56 2014 +0200
Branches: hair_system
https://developer.blender.org/rB160bdf68ccbbafa4cc1057f6df4c770a51ad6650

Merge branch 'hair_immediate_fixes' into hair_system_solver

Conflicts:
	source/blender/blenkernel/BKE_cloth.h
	source/blender/blenkernel/intern/particle_system.c
	source/blender/blenloader/intern/versioning_270.c
	source/blender/makesdna/DNA_cloth_types.h
	source/blender/makesrna/intern/rna_modifier.c
	source/blender/physics/BPH_mass_spring.h
	source/blender/physics/intern/BPH_mass_spring.cpp
	source/blender/physics/intern/implicit.h
	source/blender/physics/intern/implicit_blender.c

===================================================================



===================================================================