DEPS - Issue 156002: Merge 20205 - Update icu38 dep with a time zone issue fix....

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: DEPS

Issue 156002: Merge 20205 - Update icu38 dep with a time zone issue fix.... (Closed) Base URL: svn://chrome-svn/chrome/branches/172/src/

Patch Set: Created 11 years, 5 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

Property Changes:

Added: svn:mergeinfo
Merged /trunk/src/DEPS:r20205
Merged /branches/chrome_webkit_merge_branch/DEPS:r69-2775

OLD	NEW
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": "42115",	4 "webkit_revision": "42115",

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@285",	10 "http://google-breakpad.googlecode.com/svn/trunk/src@285",

11	11

12 "src/googleurl":	12 "src/googleurl":

13 "http://google-url.googlecode.com/svn/trunk@100",	13 "http://google-url.googlecode.com/svn/trunk@100",

14	14

15 "src/sdch/open-vcdiff":	15 "src/sdch/open-vcdiff":

16 "http://open-vcdiff.googlecode.com/svn/trunk@22",	16 "http://open-vcdiff.googlecode.com/svn/trunk@22",

17	17

18 "src/testing/gtest":	18 "src/testing/gtest":

19 "http://googletest.googlecode.com/svn/trunk@214",	19 "http://googletest.googlecode.com/svn/trunk@214",

20	20

21 "src/third_party/WebKit":	21 "src/third_party/WebKit":

22 "/branches/WebKit/172@16169",	22 "/branches/WebKit/172@16169",

23	23

24 "src/third_party/icu38":	24 "src/third_party/icu38":

25 "/trunk/deps/third_party/icu38@12390",	25 "/trunk/deps/third_party/icu38@20192",

26	26

27 # TODO(mark): Remove once this has moved into depot_tools.	27 # TODO(mark): Remove once this has moved into depot_tools.

28 "src/tools/gyp":	28 "src/tools/gyp":

29 "http://gyp.googlecode.com/svn/trunk@412",	29 "http://gyp.googlecode.com/svn/trunk@412",

30	30

31 "src/v8":	31 "src/v8":

32 "http://v8.googlecode.com/svn/branches/1.1@1981",	32 "http://v8.googlecode.com/svn/branches/1.1@1981",

33	33

34 "src/webkit/data/layout_tests/LayoutTests":	34 "src/webkit/data/layout_tests/LayoutTests":

35 "/branches/LayoutTests/172@15520",	35 "/branches/LayoutTests/172@15520",

(...skipping 53 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
89 ]	89 ]

90	90

91	91

92 hooks = [	92 hooks = [

93 {	93 {

94 # A change to a .gyp, .gypi, or to GYP itself shound run the generator.	94 # A change to a .gyp, .gypi, or to GYP itself shound run the generator.

95 "pattern": "\\.gypi?$\|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]",	95 "pattern": "\\.gypi?$\|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]",

96 "action": ["python", "src/tools/gyp/gyp_dogfood", "src/build/all.gyp"],	96 "action": ["python", "src/tools/gyp/gyp_dogfood", "src/build/all.gyp"],

97 },	97 },

98 ]	98 ]

OLD	NEW

« no previous file with comments | « no previous file | no next file » | no next file with comments »