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
..
content	Merge mozilla-central into build-system	2013-02-25 22:09:18 -08:00
jar.mn	Bug 828778 put icon in manifest so we can show provider icons in activation panel, r=gavin	2013-02-19 09:32:49 -04:00
Makefile.in	Bug 784841 - Part 18d: Convert /browser; r=gavin f=Ms2ger	2013-02-25 12:47:18 -08:00
moz.build	Bug 784841 - Part 18d: Convert /browser; r=gavin f=Ms2ger	2013-02-25 12:47:18 -08:00