review.tizen.org Git - platform/upstream/libSkiaSharp.git/commit

projects / platform / upstream / libSkiaSharp.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: fac4578 3027fda)

author	Matthew Leibowitz <mattleibow@live.com>
	Mon, 8 May 2017 23:51:37 +0000 (19:51 -0400)
committer	Matthew Leibowitz <mattleibow@live.com>
	Mon, 8 May 2017 23:51:37 +0000 (19:51 -0400)
commit	08c5b3f761ccb7de1ffabf4365383a826e7d092b
tree	a09323c45640fe5238f818494d53219dee9d6577	tree \| snapshot
parent	fac4578a01692174a354a4b18cf24e23f4ef6d3c	commit \| diff
parent	3027fda3cfe425b6fae53ef59923d554402c1414	commit \| diff

Merge branch 'chrome/m59' into update-m59

# Conflicts:
# BUILD.gn
# gn/BUILD.gn
# gn/find_ios_sysroot.py
# src/core/SkSpecialImage.cpp
# third_party/libjpeg-turbo/BUILD.gn

16 files changed:

BUILD.gn	diff1 \|	diff2 \|	blob \| history
gn/BUILD.gn	diff1 \|	diff2 \|	blob \| history
gn/BUILDCONFIG.gn	diff1 \|	diff2 \|	blob \| history
gn/core.gni	diff1 \|	diff2 \|	blob \| history
gn/effects.gni	diff1 \|	diff2 \|	blob \| history
include/c/sk_types.h	diff1 \|	diff2 \|	blob \| history
include/private/GrSwizzle.h	diff1 \|	diff2 \|	blob \| history
src/image/SkSurface.cpp	diff1 \|	diff2 \|	blob \| history
src/opts/SkRasterPipeline_opts.h	diff1 \|	diff2 \|	blob \| history
src/ports/SkFontMgr_win_dw.cpp	diff1 \|	diff2 \|	blob \| history
src/ports/SkOSFile_win.cpp	diff1 \|	diff2 \|	blob \| history
src/ports/SkScalerContext_win_dw.cpp	diff1 \|	diff2 \|	blob \| history
src/ports/SkScalerContext_win_dw.h	diff1 \|	diff2 \|	blob \| history
src/xps/SkXPSDevice.cpp	diff1 \|	diff2 \|	blob \| history
src/xps/SkXPSDocument.cpp	diff1 \|	diff2 \|	blob \| history
third_party/libjpeg-turbo/BUILD.gn	diff1 \|	diff2 \|	blob \| history

Domain: Dotnet / API;