Commit: 67d1949c5bb87f284485358cb3da5f422aab2dfa
Author: Nick Wu
Date:   Mon Jul 30 18:27:46 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB67d1949c5bb87f284485358cb3da5f422aab2dfa

Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

# Conflicts:
#       release/scripts/addons
#       release/scripts/addons_contrib

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



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



_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to