diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 01:43:41 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 01:43:41 +0000 |
| commit | 6556598eaf9a6a3249f5b965d8410305b6b6f4aa (patch) | |
| tree | b82d5af6a220f011a4ca00291f72691053878837 /DEPS | |
| parent | 661a94a7553e2cfc08e62df05892bb8d8bef0cd6 (diff) | |
| download | chromium_src-6556598eaf9a6a3249f5b965d8410305b6b6f4aa.zip chromium_src-6556598eaf9a6a3249f5b965d8410305b6b6f4aa.tar.gz chromium_src-6556598eaf9a6a3249f5b965d8410305b6b6f4aa.tar.bz2 | |
Revert r77777 (a temporary hack) and roll in the fix from ANGLE (567:571).
I put both in the same patch so I can merge them into m11 atomically.
ANGLE revisions:
571 ANGLE depends statically on D3DCompiler_x.dll.
570 Fix NULL dereference for empty constructors.
569 Newlines in multi-line comments don't count as a newline.
568 Improve debug log formatting.
TEST=try, check D3DCompiler_42.dll is loaded before the sandbox is turned on.
BUG=75349
Review URL: http://codereview.chromium.org/6694008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78145 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -38,7 +38,7 @@ deps = { (Var("googlecode_url") % "googlemock") + "/trunk@359", "src/third_party/angle": - (Var("googlecode_url") % "angleproject") + "/trunk@567", + (Var("googlecode_url") % "angleproject") + "/trunk@571", # Note that this is *not* where we check out WebKit -- this just # puts some extra files into place for the real WebKit checkout to |