[Bf-blender-cvs] [1313409e67d] soc-2018-npr: Merge branch 'soc-2018-npr' of git.blender.org:blender into soc-2018-npr

Nick Wu noreply at git.blender.org
Tue Jul 17 17:24:09 CEST 2018


Commit: 1313409e67d847e26bb92c28d67c11df2b5a8120
Author: Nick Wu
Date:   Tue Jul 17 23:23:23 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB1313409e67d847e26bb92c28d67c11df2b5a8120

Merge branch 'soc-2018-npr' of git.blender.org:blender into soc-2018-npr

# Conflicts:
#	source/blender/draw/engines/lanpr/lanpr_chain.c

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



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





More information about the Bf-blender-cvs mailing list