diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-18 10:38:55 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-18 10:38:55 +0100 |
| commit | 5839763c827cc35973e419026f926e9b8ffc118d (patch) | |
| tree | 11fd29c791adc491430a7a9b516224c2a724868e /browser/installer/windows/Makefile.in | |
| parent | 83c4b04a70d2319d4c292e7aa0c8872e7c1cd7fa (diff) | |
| parent | 45f2fcd80d2a7d536e8b486c18415a337b56cb46 (diff) | |
| download | UXP-5839763c827cc35973e419026f926e9b8ffc118d.tar UXP-5839763c827cc35973e419026f926e9b8ffc118d.tar.gz UXP-5839763c827cc35973e419026f926e9b8ffc118d.tar.lz UXP-5839763c827cc35973e419026f926e9b8ffc118d.tar.xz UXP-5839763c827cc35973e419026f926e9b8ffc118d.zip | |
Merge branch 'master' into ported-moebius
# Conflicts:
# browser/installer/windows/nsis/stub.nsi
Diffstat (limited to 'browser/installer/windows/Makefile.in')
| -rw-r--r-- | browser/installer/windows/Makefile.in | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/browser/installer/windows/Makefile.in b/browser/installer/windows/Makefile.in index acd7176cc..a8305d077 100644 --- a/browser/installer/windows/Makefile.in +++ b/browser/installer/windows/Makefile.in @@ -11,9 +11,7 @@ INSTALLER_FILES = \ app.tag \ nsis/installer.nsi \ nsis/uninstaller.nsi \ - nsis/stub.nsi \ nsis/shared.nsh \ - stub.tag \ $(NULL) ifdef MOZ_MAINTENANCE_SERVICE @@ -25,11 +23,6 @@ endif BRANDING_FILES = \ branding.nsi \ appname.bmp \ - bgintro.bmp \ - clock.bmp \ - particles.bmp \ - pencil.bmp \ - pencil-rtl.bmp \ wizHeader.bmp \ wizHeaderRTL.bmp \ wizWatermark.bmp \ |