Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(364)

Side by Side Diff: chrome/app/DEPS

Issue 100179: Merge 14891 - A better fix for http://www.crbug.com/2044: crash... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/branches/172/src/
Patch Set: Created 11 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/app/chrome_dll_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
Merged /trunk/src/chrome/app/DEPS:r13132,13255,13273,13285,13348,13453,13611,13636,13723,13916,13926,14234,14242,14891
Merged /branches/chrome_webkit_merge_branch/chrome/app/DEPS:r69-2775
OLDNEW
1 include_rules = [ 1 include_rules = [
2 "+breakpad", 2 "+breakpad",
3 "+chrome/browser", 3 "+chrome/browser",
4 "+chrome/installer", 4 "+chrome/installer",
5 "+chrome/personalization", 5 "+chrome/personalization",
6 "+sandbox", 6 "+sandbox",
7 "+skia/include/corecg",
7 "+tools/memory_watcher", 8 "+tools/memory_watcher",
8 ] 9 ]
OLDNEW
« no previous file with comments | « no previous file | chrome/app/chrome_dll_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698