Commit: f63ce02a63cd1c399de212bad1a4a5b2510d4d5f
Author: Lukas Tönne
Date: Thu Oct 30 15:24:40 2014 +0100
Branches: gooseberry
https://developer.blender.org/rBf63ce02a63cd1c399de212bad1a4a5b2510d4d5f
Merge branch 'master' into gooseberry
Conflicts:
source/blender/blenlib/BLI_math_matrix.h
source/blender/blenlib/intern/math_matrix.c
source/blender/editors/object/object_bake_api.c
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
