Gregory Szorc 16f0413b0c 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
..
content	Bug 784841 - Part 18d: Convert /browser; r=gavin f=Ms2ger	2013-02-25 12:47:18 -08:00
locales	Bug 784841 - Part 18d: Convert /browser; r=gavin f=Ms2ger	2013-02-25 12:47:18 -08:00
pref	Bug 716478 - update licence to MPL 2.	2012-05-21 12:12:37 +01:00
appname.bmp	Artwork for Bug 795654 - Add artwork and text positioning around artwork for nightly and aurora stub installer. r=bbondy	2012-10-05 13:56:15 -07:00
background.png
bgintro.bmp	Artwork for Bug 795654 - Add artwork and text positioning around artwork for nightly and aurora stub installer. r=bbondy	2012-10-05 13:56:15 -07:00
bgplain.bmp	Bug 322206 - Firefox net / stub installer - artwork. r=bbondy	2012-09-28 15:46:09 -07:00
branding.nsi	Bug 802734 - Add installer telemetry ping information. r=bbondy	2012-11-01 17:35:46 -04:00
clock.bmp	Artwork for Bug 795654 - Add artwork and text positioning around artwork for nightly and aurora stub installer. r=bbondy	2012-10-05 13:56:15 -07:00
configure.sh	Bug 716478 - update licence to MPL 2.	2012-05-21 12:12:37 +01:00
default16.png
default32.png
default48.png
disk.icns
document-os2.ico
document.icns
document.ico
dsstore
firefox-os2.ico
firefox.icns
firefox.ico
Makefile.in	Merge mozilla-central into build-system	2013-02-25 22:09:18 -08:00
moz.build	Bug 784841 - Part 18d: Convert /browser; r=gavin f=Ms2ger	2013-02-25 12:47:18 -08:00
mozicon128.png
newtab.ico	Bug 515785 - Use new icons for each task in Win7 Jump list tasks. r=bbondy	2012-04-28 11:22:06 -04:00
newwindow.ico	Bug 515785 - Use new icons for each task in Win7 Jump list tasks. r=bbondy	2012-04-28 11:22:06 -04:00
particles.bmp	Artwork for Bug 795654 - Add artwork and text positioning around artwork for nightly and aurora stub installer. r=bbondy	2012-10-05 13:56:15 -07:00
pbmode.ico	Bug 515785 - Use new icons for each task in Win7 Jump list tasks. r=bbondy	2012-04-28 11:22:06 -04:00
pencil-rtl.bmp	Artwork for Bug 795654 - Add artwork and text positioning around artwork for nightly and aurora stub installer. r=bbondy	2012-10-05 13:56:15 -07:00
pencil.bmp	Artwork for Bug 795654 - Add artwork and text positioning around artwork for nightly and aurora stub installer. r=bbondy	2012-10-05 13:56:15 -07:00
VisualElementsManifest.xml	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
wizHeader.bmp
wizHeaderRTL.bmp
wizWatermark.bmp