Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Issue 29330952: Issue 3127 - Merge conflicts, base 42.0.1 (Closed)

Created:
Nov. 26, 2015, 11:01 a.m. by René Jeschke
Modified:
Jan. 27, 2016, 11:08 a.m.
Reviewers:
Felix Dahlke
Visibility:
Public.

Description

Merge conflicts, base 42.0.1

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+223 lines, -106 lines) Patch
M .hgtags View 1 chunk +2 lines, -0 lines 0 comments Download
M mobile/android/app/mobile.js View 8 chunks +33 lines, -9 lines 0 comments Download
M mobile/android/base/AppConstants.java.in View 1 chunk +8 lines, -0 lines 0 comments Download
M mobile/android/base/home/HomeConfigPrefsBackend.java View 1 chunk +1 line, -4 lines 0 comments Download
M mobile/android/base/locales/en-US/android_strings.dtd View 1 chunk +3 lines, -1 line 0 comments Download
M mobile/android/base/resources/drawable-hdpi/url_bar_entry_default_pb.9.png View Binary file 0 comments Download
M mobile/android/base/resources/drawable-hdpi/url_bar_entry_pressed_pb.9.png View Binary file 0 comments Download
M mobile/android/base/resources/drawable-large-hdpi-v11/url_bar_entry_default_pb.9.png View Binary file 0 comments Download
M mobile/android/base/resources/drawable-large-hdpi-v11/url_bar_entry_pressed_pb.9.png View Binary file 0 comments Download
M mobile/android/base/resources/drawable-large-xhdpi-v11/url_bar_entry_default_pb.9.png View Binary file 0 comments Download
M mobile/android/base/resources/drawable-large-xhdpi-v11/url_bar_entry_pressed_pb.9.png View Binary file 0 comments Download
M mobile/android/base/resources/drawable-large-xxhdpi-v11/url_bar_entry_default_pb.9.png View Binary file 0 comments Download
M mobile/android/base/resources/drawable-large-xxhdpi-v11/url_bar_entry_pressed_pb.9.png View Binary file 0 comments Download
M mobile/android/base/resources/drawable-xhdpi/url_bar_entry_default_pb.9.png View Binary file 0 comments Download
M mobile/android/base/resources/drawable-xhdpi/url_bar_entry_pressed_pb.9.png View Binary file 0 comments Download
M mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_default_pb.9.png View Binary file 0 comments Download
M mobile/android/base/resources/drawable-xxhdpi/url_bar_entry_pressed_pb.9.png View Binary file 0 comments Download
M mobile/android/base/resources/layout/tabs_item_row.xml View 2 chunks +3 lines, -3 lines 0 comments Download
M mobile/android/base/resources/menu-large-v11/browser_app_menu.xml View 3 chunks +7 lines, -0 lines 0 comments Download
M mobile/android/base/resources/menu-v11/browser_app_menu.xml View 3 chunks +7 lines, -0 lines 0 comments Download
M mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml View 3 chunks +7 lines, -0 lines 0 comments Download
M mobile/android/base/resources/menu/browser_app_menu.xml View 2 chunks +7 lines, -0 lines 0 comments Download
M mobile/android/base/resources/values/colors.xml View 3 chunks +12 lines, -8 lines 0 comments Download
M mobile/android/base/resources/xml-v11/preference_headers.xml View 2 chunks +7 lines, -6 lines 0 comments Download
M mobile/android/base/resources/xml-v11/preferences.xml View 3 chunks +9 lines, -12 lines 0 comments Download
M mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml View 1 chunk +1 line, -3 lines 0 comments Download
M mobile/android/base/resources/xml/preferences.xml View 4 chunks +17 lines, -5 lines 0 comments Download
M mobile/android/base/strings.xml.in View 5 chunks +82 lines, -12 lines 0 comments Download
M mobile/android/confvars.sh View 2 chunks +5 lines, -5 lines 0 comments Download
M mobile/locales/en-US/chrome/region.properties View 1 chunk +12 lines, -38 lines 0 comments Download
M security/manager/ssl/tests/unit/tlsserver/cert9.db View Binary file 0 comments Download
M security/manager/ssl/tests/unit/tlsserver/key4.db View Binary file 0 comments Download

Messages

Total messages: 1
René Jeschke
Nov. 26, 2015, 12:38 p.m. (2015-11-26 12:38:06 UTC) #1

          

Powered by Google App Engine
This is Rietveld