Merge branch 'feature-patheffect' into update-skia-m52
authorMatthew Leibowitz <mattleibow@live.com>
Wed, 13 Jul 2016 23:42:15 +0000 (01:42 +0200)
committerMatthew Leibowitz <mattleibow@live.com>
Wed, 13 Jul 2016 23:42:15 +0000 (01:42 +0200)
commit7234fc471549f9b6d694bd71a75261840afd18e9
treebb85d915cbe91bd2e5a8921592eef71b9cadfdb0
parentc2a03e939a4a0b53c147a78c1fa349c8b2a3034f
parente31d35bc32be52f8e2c9da9628c89ca5646ad975
Merge branch 'feature-patheffect' into update-skia-m52

# Conflicts:
# include/c/xamarin/sk_x_types.h
# src/c/xamarin/sk_x_types_priv.h
gyp/core.gypi
include/c/xamarin/sk_x_types.h
src/c/xamarin/sk_x_paint.cpp
src/c/xamarin/sk_x_types_priv.h