| commit | 2880df2609eba09b555ca37be04b6ad89290c765 | [log] [tgz] |
|---|---|---|
| author | Tom Hudson <tomhudson@google.com> | Thu Oct 29 09:55:42 2015 -0400 |
| committer | Tom Hudson <tomhudson@google.com> | Thu Oct 29 09:55:42 2015 -0400 |
| tree | 3edc51fb7bbb40d749dd760f72f4a8a1e470e75a | |
| parent | f7834221ac5342a3446b9b299398ea3ff7976946 [diff] [blame] |
Revert "Revert "Merge remote-tracking branch 'goog/master-skia' into goog/master"" When I broke android yesterday we reverted this merge to fix the breakage. Undoing that revert so we can pull in the fix from Skia.
diff --git a/gyp/ktx.gyp b/gyp/ktx.gyp index 1ee0349..e01ef1f 100644 --- a/gyp/ktx.gyp +++ b/gyp/ktx.gyp
@@ -13,6 +13,7 @@ 'include_dirs' : [ '../third_party/ktx', '../include/gpu', + '../include/private', '../src/core', '../src/gpu', '../src/utils',