Ehsan Akhgari 2ebe293b60 Followup of the backout of bug 542999, fix an incorrect merge conflict resolution		2010-11-29 22:27:46 -05:00
..
public	Bug 568691 - Register extension components/chrome again. This doesn't remove the EM restart yet, because there's some weirdness about reading default prefs from extensions that needs to be solved first.	2010-06-23 12:18:32 -04:00
src	Merge backout of bug 542999	2010-11-29 20:50:32 -05:00
test	Followup of the backout of bug 542999, fix an incorrect merge conflict resolution	2010-11-29 22:27:46 -05:00
Makefile.in	Testcase for bug 380398: appversion manifest flag is broken in certain situations. r=bsmedberg	2007-05-30 14:52:47 -07:00