Merge branch 'xamarin-svg-canvas' into xamarin-mobile-bindings
authorMatthew Leibowitz <mattleibow@live.com>
Mon, 16 Jan 2017 12:08:07 +0000 (14:08 +0200)
committerMatthew Leibowitz <mattleibow@live.com>
Mon, 16 Jan 2017 12:56:02 +0000 (14:56 +0200)
commit706b362df172f4c2538e9f6848f9957a4ea9dc87
tree1319ca52ef04e4034d05f31f540f054feca559fe
parent9c8be5a39d3f884562e0fe0344772c3bc92413f5
parentff8f6033b6ae875ded32dd5598c3c82b3f3a9140
Merge branch 'xamarin-svg-canvas' into xamarin-mobile-bindings

# Conflicts:
# gyp/core.gyp
# gyp/core.gypi
# include/c/sk_types.h
# src/c/sk_types_priv.h
gn/core.gni
gyp/core.gyp
include/c/sk_types.h
src/c/sk_svg.cpp
src/c/sk_types_priv.h