summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-01-16 15:17:15 +0000
committerBen Murdoch <benm@google.com>2011-01-16 15:18:37 +0000
commitac1e49eb6695f711d72215fcdf9388548942a00d (patch)
tree88c78e7d66603996cf0dc78d7676b11d57a305bd /build
parentdac52a1b6f0c401bccca1e5713f782a8b26345b3 (diff)
downloadexternal_chromium-ac1e49eb6695f711d72215fcdf9388548942a00d.zip
external_chromium-ac1e49eb6695f711d72215fcdf9388548942a00d.tar.gz
external_chromium-ac1e49eb6695f711d72215fcdf9388548942a00d.tar.bz2
Merge Chromium at 9.0.597.69: Trivial merge by Git.
/branches/597/src@71538 Change-Id: Id9fad65a5e6d2ab901d9c8bff6dbf96ab7977f36
Diffstat (limited to 'build')
-rw-r--r--build/all.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 9c33cc8..79453dd 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -391,6 +391,7 @@
'../chrome/app/locales/locales.gyp:*',
'../chrome/chrome.gyp:crash_service',
'../chrome/chrome.gyp:page_cycler_tests',
+ '../chrome/chrome.gyp:policy_templates',
'../chrome/chrome.gyp:pyautolib',
'../chrome/chrome.gyp:reliability_tests',
'../chrome/chrome.gyp:startup_tests',