summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2013-08-28 11:28:09 +0100
committerTorne (Richard Coles) <torne@google.com>2013-08-28 11:28:09 +0100
commitcdbac3f28ca40de9b6d7e80e5b10907aaaa8a1ca (patch)
tree10b8d79c3f218dbde11a080ef0dc30467cc5f25f
parentcbd8d327b193e3a05a88ce888b14ba526450728f (diff)
parentffdb65f5c5352876c0e6d384b0bc70f6dea18078 (diff)
downloadgyp-cdbac3f28ca40de9b6d7e80e5b10907aaaa8a1ca.tar.gz
Merge third_party/skia/gyp from https://chromium.googlesource.com/a/external/skia/gyp.git at ffdb65f5c5352876c0e6d384b0bc70f6dea18078
This commit was generated by merge_from_chromium.py. Change-Id: Ie0b9c729f52efacb051dddbefa8554f1b1a5d030
-rw-r--r--gmslides.gypi1
1 files changed, 1 insertions, 0 deletions
diff --git a/gmslides.gypi b/gmslides.gypi
index 87c46e7..db0e286 100644
--- a/gmslides.gypi
+++ b/gmslides.gypi
@@ -77,6 +77,7 @@
'../gm/mixedxfermodes.cpp',
'../gm/modecolorfilters.cpp',
'../gm/morphology.cpp',
+ '../gm/nested.cpp',
'../gm/ninepatchstretch.cpp',
'../gm/nocolorbleed.cpp',
'../gm/optimizations.cpp',