Merge remote-tracking branch 'origin/xamarin-mobile-bindings' into xamarin-mobile...
authorTyler Hoeflicker <thoeflicker@bluebeam.com>
Mon, 14 Nov 2016 18:38:56 +0000 (10:38 -0800)
committerTyler Hoeflicker <thoeflicker@bluebeam.com>
Mon, 14 Nov 2016 18:38:56 +0000 (10:38 -0800)
1  2 
include/c/sk_bitmap.h
src/c/sk_bitmap.cpp

Simple merge
Simple merge