summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2013-08-28 12:08:03 +0100
committerTorne (Richard Coles) <torne@google.com>2013-08-28 12:08:03 +0100
commitc06b1f5ec2cc49a9911a1bde0397b037b5b41524 (patch)
tree10b8d79c3f218dbde11a080ef0dc30467cc5f25f
parentc9840ed6efc5e7f9cd6fddb5f8d72cf5f8ec5b6b (diff)
parentcdbac3f28ca40de9b6d7e80e5b10907aaaa8a1ca (diff)
downloadgyp-c06b1f5ec2cc49a9911a1bde0397b037b5b41524.tar.gz
Merge from Chromium at DEPS revision 30.0.1599.23
This commit was generated by merge_to_master.py. Change-Id: Icc43d5e2b37569e5a240d2c361b2232a61d3c878
-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',