diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-11-10 11:39:27 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-11-10 11:39:27 +0100 |
| commit | 974a481d12bf430891725bd3662876358e57e11a (patch) | |
| tree | cad011151456251fef2f1b8d02ef4b4e45fad61a /build/mach_bootstrap.py | |
| parent | 6bd66b1728eeddb058066edda740aaeb2ceaec23 (diff) | |
| parent | 736d25cbec4541186ed46c935c117ce4d1c7f3bb (diff) | |
| download | UXP-974a481d12bf430891725bd3662876358e57e11a.tar UXP-974a481d12bf430891725bd3662876358e57e11a.tar.gz UXP-974a481d12bf430891725bd3662876358e57e11a.tar.lz UXP-974a481d12bf430891725bd3662876358e57e11a.tar.xz UXP-974a481d12bf430891725bd3662876358e57e11a.zip | |
Merge branch 'master' into js-modules
# Conflicts:
# modules/libpref/init/all.js
Diffstat (limited to 'build/mach_bootstrap.py')
| -rw-r--r-- | build/mach_bootstrap.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/build/mach_bootstrap.py b/build/mach_bootstrap.py index bdf7c9b03..48a71c669 100644 --- a/build/mach_bootstrap.py +++ b/build/mach_bootstrap.py @@ -127,7 +127,6 @@ MACH_MODULES = [ 'tools/lint/mach_commands.py', 'tools/mach_commands.py', 'tools/power/mach_commands.py', - 'mobile/android/mach_commands.py', ] if os.path.exists('addon-sdk/mach_commands.py'): |