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

Side by Side Diff: DEPS

Issue 176023: Merge 24732 - Pull in ICU38 r24730 (locale data updates/fixes) to the trunk.... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Modified: svn:mergeinfo
Merged /trunk/src/DEPS:r24732
OLDNEW
1 vars = { 1 vars = {
2 "webkit_trunk": 2 "webkit_trunk":
3 "http://svn.webkit.org/repository/webkit/trunk", 3 "http://svn.webkit.org/repository/webkit/trunk",
4 "webkit_revision": "46143", 4 "webkit_revision": "46143",
5 } 5 }
6 6
7 7
8 deps = { 8 deps = {
9 "src/breakpad/src": 9 "src/breakpad/src":
10 "http://google-breakpad.googlecode.com/svn/trunk/src@346", 10 "http://google-breakpad.googlecode.com/svn/trunk/src@346",
11 11
12 "src/build/util/support": 12 "src/build/util/support":
13 "/trunk/deps/support@19914", 13 "/trunk/deps/support@19914",
14 14
15 "src/googleurl": 15 "src/googleurl":
16 "http://google-url.googlecode.com/svn/trunk@113", 16 "http://google-url.googlecode.com/svn/trunk@113",
17 17
18 "src/sdch/open-vcdiff": 18 "src/sdch/open-vcdiff":
19 "http://open-vcdiff.googlecode.com/svn/trunk@26", 19 "http://open-vcdiff.googlecode.com/svn/trunk@26",
20 20
21 "src/testing/gtest": 21 "src/testing/gtest":
22 "http://googletest.googlecode.com/svn/trunk@267", 22 "http://googletest.googlecode.com/svn/trunk@267",
23 23
24 "src/third_party/WebKit": 24 "src/third_party/WebKit":
25 "/trunk/deps/third_party/WebKit@20601", 25 "/trunk/deps/third_party/WebKit@20601",
26 26
27 "src/third_party/icu38": 27 "src/third_party/icu38":
28 "/trunk/deps/third_party/icu38@20192", 28 "/trunk/deps/third_party/icu38@24730",
29 29
30 "src/third_party/protobuf2/src": 30 "src/third_party/protobuf2/src":
31 "http://protobuf.googlecode.com/svn/trunk@154", 31 "http://protobuf.googlecode.com/svn/trunk@154",
32 32
33 # TODO(mark): Remove once this has moved into depot_tools. 33 # TODO(mark): Remove once this has moved into depot_tools.
34 "src/tools/gyp": 34 "src/tools/gyp":
35 "http://gyp.googlecode.com/svn/trunk@553", 35 "http://gyp.googlecode.com/svn/trunk@553",
36 36
37 "src/v8": 37 "src/v8":
38 "http://v8.googlecode.com/svn/branches/1.2@2530", 38 "http://v8.googlecode.com/svn/branches/1.2@2530",
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 136
137 137
138 hooks = [ 138 hooks = [
139 { 139 {
140 # A change to a .gyp, .gypi, or to GYP itself shound run the generator. 140 # A change to a .gyp, .gypi, or to GYP itself shound run the generator.
141 "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]", 141 "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]",
142 "action": ["python", "src/tools/gyp/gyp_chromium"], 142 "action": ["python", "src/tools/gyp/gyp_chromium"],
143 }, 143 },
144 ] 144 ]
145 145
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698