Commit: 40630ebd09a4bba5c0400259ee25ec1953a0ca71
Author: Bastien Montagne
Date: Tue Aug 26 12:27:21 2014 +0200
Branches: testbuild
https://developer.blender.org/rB40630ebd09a4bba5c0400259ee25ec1953a0ca71
Merge branch 'master' into testbuild
Conflicts:
source/blender/blenkernel/intern/texture.c
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
