Unified Diff: mobile/android/base/AppConstants.java.in
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.
« no previous file with comments
|
« mobile/android/app/mobile.js ('k')
|
mobile/android/base/home/HomeConfigPrefsBackend.java » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: mobile/android/base/AppConstants.java.in |
| diff --git a/mobile/android/base/AppConstants.java.in b/mobile/android/base/AppConstants.java.in |
| index 961c3727e2d5d5414db9e7a6e13e3a04f0895751..22020fcf4dd3836c9dc2b1925ef2ce9493f3f845 100644 |
| --- a/mobile/android/base/AppConstants.java.in |
| +++ b/mobile/android/base/AppConstants.java.in |
| @@ -323,4 +323,12 @@ public class AppConstants { |
| //#else |
| false; |
| //#endif |
| + |
| + public static final boolean ABB_RELEASE_BUILD = |
| +//#ifdef ABB_RELEASE_BUILD |
| + true; |
| +//#else |
| + false; |
| +//#endif |
| + |
| } |
« no previous file with comments
|
« mobile/android/app/mobile.js ('k')
|
mobile/android/base/home/HomeConfigPrefsBackend.java » ('j')
|
no next file with comments »
