Merge branch 'xamarin-mobile-bindings' into gpu-support
authorMatthew Leibowitz <mattleibow@live.com>
Sat, 20 Aug 2016 18:54:59 +0000 (20:54 +0200)
committerMatthew Leibowitz <mattleibow@live.com>
Sat, 20 Aug 2016 18:54:59 +0000 (20:54 +0200)
commit18f95a7963dd1eac6ef8b4cdab94c92f8ca9b63b
tree30e13f927b6aac9ef7beedc74d3148cea8c83ee6
parent01b9fc27b9e0283961ac7a9a3715b09e0aa55f5b
parente059dab91769c3de9e15133ec1d855a93d40c693
Merge branch 'xamarin-mobile-bindings' into gpu-support

# Conflicts:
# include/c/sk_canvas.h
# src/c/sk_canvas.cpp
include/c/sk_canvas.h
include/c/sk_types.h
src/c/sk_canvas.cpp
src/c/sk_enums.cpp
src/c/sk_types_priv.h