Issue 452024: Manually merge r33152 into the 249 branch. The merge could not be done automa...

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 452024: Manually merge r33152 into the 249 branch. The merge could not be done automa... (Closed)

Created:
11 years ago by idana

Modified:
9 years, 7 months ago

Reviewers:

CC:
chromium-reviews_googlegroups.com, ben+cc_chromium.org

Base URL:
svn://chrome-svn/chrome/branches/249/src/

Visibility:
Public.

Manually merge r33152 into the 249 branch. The merge could not be done automatically due to conflicts. Original code review URL: http://codereview.chromium.org/418044 BUG=26551 TEST=See bug description. TBR=tim@chromium.org Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=33392

Created: 11 years ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+39 lines, -7 lines)			Patch
	M	chrome/browser/views/bookmark_manager_view.h	View		1 chunk	+4 lines, -0 lines	0 comments	Download
	M	chrome/browser/views/bookmark_manager_view.cc	View		5 chunks	+35 lines, -7 lines	0 comments	Download