summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-08 18:39:08 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-08 18:39:08 +0000
commit7f4c815ce4b12d2e65042a23af9007a2e8c1cefe (patch)
treea6f1f7a0db6ad8db2e49734c1b25fd36396f4723
parent6872dc1badade604dbe2b9c51cd9462986454cb9 (diff)
downloadchromium_src-7f4c815ce4b12d2e65042a23af9007a2e8c1cefe.zip
chromium_src-7f4c815ce4b12d2e65042a23af9007a2e8c1cefe.tar.gz
chromium_src-7f4c815ce4b12d2e65042a23af9007a2e8c1cefe.tar.bz2
Roll gyp 1830:1831
1831 - Don't try to match mixed source/dir gyp order on MSVS prior to 2010 BUG=none TBR=scottmg@chromium.org Review URL: https://codereview.chromium.org/128473002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243609 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index a768b46..8717eca 100644
--- a/DEPS
+++ b/DEPS
@@ -132,7 +132,7 @@ deps = {
(Var("googlecode_url") % "grit-i18n") + "/trunk@141",
"src/tools/gyp":
- (Var("googlecode_url") % "gyp") + "/trunk@1830",
+ (Var("googlecode_url") % "gyp") + "/trunk@1831",
"src/tools/swarming_client":
Var("chromium_git") + "/external/swarming.client.git@" +