mobile/android/confvars.sh - Issue 29330952: Issue 3127 - Merge conflicts, base 42.0.1

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
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
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
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
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: mobile/android/confvars.sh

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

Patch Set: Created Nov. 26, 2015, 11:01 a.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: mobile/android/confvars.sh

diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh

index 7ceb03ae699590ac66138979e59a86928a1d08d2..e79c2c9e1ec4010e2d895714039fd30ea9974d98 100644

--- a/mobile/android/confvars.sh

+++ b/mobile/android/confvars.sh

@@ -5,12 +5,12 @@

MOZ_APP_BASENAME=Fennec

MOZ_APP_VENDOR=Mozilla

-MOZ_APP_VERSION=$FIREFOX_VERSION

-MOZ_APP_VERSION_DISPLAY=$FIREFOX_VERSION_DISPLAY

+MOZ_APP_VERSION=1.1.0

+MOZ_APP_VERSION_DISPLAY=$MOZ_APP_VERSION

MOZ_APP_UA_NAME=Firefox

-MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial

-MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/official

+MOZ_BRANDING_DIRECTORY=mobile/android/branding/adblockbrowser

+MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/adblockbrowser

# MOZ_APP_DISPLAYNAME is set by branding/configure.sh

# We support Android SDK version 9 and up by default.

@@ -49,7 +49,7 @@ MOZ_DISABLE_EXPORT_JS=1

# use custom widget for html:select

MOZ_USE_NATIVE_POPUP_WINDOWS=1

-MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110}

+MOZ_APP_ID={55aba3ac-94d3-41a8-9e25-5c21fe874539}

MOZ_APP_STATIC_INI=1

« no previous file with comments | « mobile/android/base/strings.xml.in ('k') | mobile/locales/en-US/chrome/region.properties » ('j') | no next file with comments »