Issue 1289123002: Merge branch 'master' into heuristics

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

Issue 1289123002: Merge branch 'master' into heuristics

Created:
5 years, 4 months ago by cjhopman

Modified:
5 years, 4 months ago

Reviewers:

Base URL:
git@github.com:chromium/dom-distiller.git@master

Target Ref:
refs/heads/master

Visibility:
Public.

More Reviews

Description

Merge branch 'master' into heuristics . . . git squash commit. 20ef9d5839842f53ee83b7f833c1be2319ee3c49 . cc342657b9481d2f0e7efb8d48c5226390951066 . 1ac4c9140c723dac743eaa42ad92b1ea81a98b01 . BUG=

Patch Set 1 #

Created: 5 years, 4 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+1168 lines, --1 lines)			Patch
A	calculate_derived_features.py	View	1 chunk	+99 lines, -0 lines	0 comments	Download
A	extract_features.js	View	1 chunk	+24 lines, -0 lines	0 comments	Download
A	foo/index	View	1 chunk	+1 line, -0 lines	0 comments	Download
A	foo/server.conf	View	1 chunk	+3 lines, -0 lines	0 comments	Download
A	foo/server.py	View	1 chunk	+187 lines, -0 lines	0 comments	Download
A +	foo/test.css	View	0 chunks	+-1 lines, --1 lines	0 comments	Download
A	foo/test.html	View	1 chunk	+164 lines, -0 lines	0 comments	Download
A	foo/test.js	View	1 chunk	+301 lines, -0 lines	0 comments	Download
A	get_features.py	View	1 chunk	+120 lines, -0 lines	0 comments	Download
A	get_screenshots.py	View	1 chunk	+124 lines, -0 lines	0 comments	Download
A	quick_score.py	View	1 chunk	+54 lines, -0 lines	0 comments	Download
A	write_features_csv.py	View	1 chunk	+60 lines, -0 lines	0 comments	Download
A	write_html.py	View	1 chunk	+32 lines, -0 lines	0 comments	Download

Depends on Patchset:

Issue 1000523002 Patch 20001

Dependent Patchsets:

Issue 1620043002 Patch 60001