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

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:
View side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 »

Powered by Google App Engine
This is Rietveld