diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-10-02 12:10:56 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-10-02 12:10:56 +0100 |
| commit | 5691c0182f02e97ca9369fd8962a375cff24e876 (patch) | |
| tree | 8ec7fd160da63434c3467634aa57235228813d41 | |
| parent | 8ead1f84df99b2e811fb5e1cf5d2fca9ae3ac934 (diff) | |
| parent | 4558d6c52772c6ef6638a45a6bd9fb852a01148b (diff) | |
| download | gyp-5691c0182f02e97ca9369fd8962a375cff24e876.tar.gz | |
Merge third_party/skia/gyp from https://chromium.googlesource.com/a/external/skia/gyp.git at 4558d6c52772c6ef6638a45a6bd9fb852a01148b
This commit was generated by merge_from_chromium.py.
Change-Id: If1cf9ef466b9e92005ab4ee2dac04d92a16cb4f4
| -rw-r--r-- | tests.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -34,7 +34,7 @@ '../tests/BlitRowTest.cpp', '../tests/BlurTest.cpp', '../tests/CanvasTest.cpp', - '../tests/CanvasStateTest.cpp', +# '../tests/CanvasStateTest.cpp', '../tests/ChecksumTest.cpp', '../tests/ClampRangeTest.cpp', '../tests/ClipCacheTest.cpp', |