Commit: 7b79216c5463a025554d9bbc7e4f1fc150742b52
Author: Bastien Montagne
Date: Wed Oct 24 08:26:32 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB7b79216c5463a025554d9bbc7e4f1fc150742b52
Merge branch 'master' into blender2.8
Conflicts:
intern/locale/boost_locale_wrapper.cpp
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
