[Soc-2017-dev] Merging master

[dr. Sybren A. Stüvel]

Hey all,

I know it's past the coding deadline already, but... it would be nice
if all the GSoC could merge the current master branch into their
sox-2017-xxxx branch (if not done already). This will make make things
easier to merge later on.

Cheers,
-- 
Sybren A. Stüvel

https://cloud.blender.org/
https://stuvelfoto.nl/
https://stuvel.eu/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.blender.org/pipermail/soc-2017-dev/attachments/20170904/ac8732bc/attachment.sig>