Commit Graph

14 Commits

Author SHA1 Message Date
Gregory Szorc
faf262c4ee Merge mozilla-central into build-system
Only conflict was configure.in amd was due to context, not
changed lines themselves.
2013-02-25 22:09:18 -08:00
Gregory Szorc
758d7a8978 Bug 784841 - Part 18d: Convert /browser; r=gavin f=Ms2ger 2013-02-25 12:47:18 -08:00
Jim Mathies
e72e340ce5 Bug 844270 - Move visual manifests into branding, and set custom background colors for each release. r=glandium 2013-02-25 08:33:56 -06:00
Justin Wood
4566ed0c1c Bug 844336 - Aurora win32 L10N builds broken by bug 823218. r=khuey 2013-02-22 16:45:00 -05:00
Jim Mathies
dda1c6edca Bug 823218 - merge metro branding to mc. r=glandium 2013-02-12 14:51:23 -06:00
Robert Strong
63658dd918 Bug 322206 - Firefox net / stub installer - stub build system prep. r=bbondy 2012-09-28 15:46:22 -07:00
Gregory Szorc
0085180e1e Backout 8d9c80e2f95b (bug 786520) for breaking l10n nightlies (bug 789838) 2012-09-10 13:34:17 -07:00
Gregory Szorc
192a616ee5 Bug 786520 - Clean up branding Makefile.in's for browser; r=ted
Previously all Makefile.in were identical. Common bits are now
refactored into a shared .mk file. They also use the generic
copy/install rule instead of a one-off make rule.
2012-09-04 10:38:42 -07:00
Mike Hommey
6173fa297f Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted 2012-08-04 20:26:44 +02:00
Gervase Markham
ca171eec44 Bug 716478 - update licence to MPL 2. 2012-05-21 12:12:37 +01:00
Jared Wein
2a4a40439b Bug 515785 - Use new icons for each task in Win7 Jump list tasks. r=bbondy 2012-04-28 11:22:06 -04:00
Ed Morley
5d8d5d2581 Bug 653333 - Remove legacy splash screen code (nsSplashScreen, MOZ_SPLASHSCREEN, splash.bmp) now that no platforms use it; r=dtownsend,bsmedberg 2011-08-04 09:04:40 +02:00
Jared Wein
feeef626dc Bug 504645 - Remove document.png from the source tree since it is no longer needed; r=dolske+mfinkle 2011-06-26 18:27:59 +02:00
Mike Hommey
bd15cd1113 Bug 561032 - Move Firefox branding into browser/branding/official. r=gavin,r=pike
--HG--
rename : other-licenses/branding/firefox/LICENSE => browser/branding/official/LICENSE
rename : other-licenses/branding/firefox/Makefile.in => browser/branding/official/Makefile.in
rename : other-licenses/branding/firefox/background.png => browser/branding/official/background.png
rename : other-licenses/branding/firefox/branding.nsi => browser/branding/official/branding.nsi
rename : other-licenses/branding/firefox/configure.sh => browser/branding/official/configure.sh
rename : other-licenses/branding/firefox/content/Makefile.in => browser/branding/official/content/Makefile.in
rename : other-licenses/branding/firefox/content/about-logo.png => browser/branding/official/content/about-logo.png
rename : other-licenses/branding/firefox/content/about-wordmark.png => browser/branding/official/content/about-wordmark.png
rename : other-licenses/branding/firefox/content/about.png => browser/branding/official/content/about.png
rename : other-licenses/branding/firefox/content/icon48.png => browser/branding/official/content/icon48.png
rename : other-licenses/branding/firefox/content/icon64.png => browser/branding/official/content/icon64.png
rename : other-licenses/branding/firefox/content/jar.mn => browser/branding/official/content/jar.mn
rename : other-licenses/branding/firefox/default16.png => browser/branding/official/default16.png
rename : other-licenses/branding/firefox/default22.png => browser/branding/official/default22.png
rename : other-licenses/branding/firefox/default24.png => browser/branding/official/default24.png
rename : other-licenses/branding/firefox/default256.png => browser/branding/official/default256.png
rename : other-licenses/branding/firefox/default32.png => browser/branding/official/default32.png
rename : other-licenses/branding/firefox/default48.png => browser/branding/official/default48.png
rename : other-licenses/branding/firefox/disk.icns => browser/branding/official/disk.icns
rename : other-licenses/branding/firefox/document-os2.ico => browser/branding/official/document-os2.ico
rename : other-licenses/branding/firefox/document.icns => browser/branding/official/document.icns
rename : other-licenses/branding/firefox/document.ico => browser/branding/official/document.ico
rename : other-licenses/branding/firefox/document.png => browser/branding/official/document.png
rename : other-licenses/branding/firefox/dsstore => browser/branding/official/dsstore
rename : other-licenses/branding/firefox/firefox-os2.ico => browser/branding/official/firefox-os2.ico
rename : other-licenses/branding/firefox/firefox.icns => browser/branding/official/firefox.icns
rename : other-licenses/branding/firefox/firefox.ico => browser/branding/official/firefox.ico
rename : other-licenses/branding/firefox/locales/Makefile.in => browser/branding/official/locales/Makefile.in
rename : other-licenses/branding/firefox/locales/browserconfig.properties => browser/branding/official/locales/browserconfig.properties
rename : other-licenses/branding/firefox/locales/en-US/brand.dtd => browser/branding/official/locales/en-US/brand.dtd
rename : other-licenses/branding/firefox/locales/en-US/brand.properties => browser/branding/official/locales/en-US/brand.properties
rename : other-licenses/branding/firefox/locales/jar.mn => browser/branding/official/locales/jar.mn
rename : other-licenses/branding/firefox/mozicon128.png => browser/branding/official/mozicon128.png
rename : other-licenses/branding/firefox/pref/firefox-branding.js => browser/branding/official/pref/firefox-branding.js
rename : other-licenses/branding/firefox/splash.bmp => browser/branding/official/splash.bmp
rename : other-licenses/branding/firefox/wizHeader.bmp => browser/branding/official/wizHeader.bmp
rename : other-licenses/branding/firefox/wizHeaderRTL.bmp => browser/branding/official/wizHeaderRTL.bmp
rename : other-licenses/branding/firefox/wizWatermark.bmp => browser/branding/official/wizWatermark.bmp
2011-04-13 09:58:13 +02:00