Doug Turner 0dc0f3273e merge with m-c. resolved conflicts in: ... U chrome/src/nsChromeRegistry.cpp U content/base/src/Makefile.in U dom/base/nsDOMClassInfo.cpp U toolkit/toolkit-tiers.mk --HG-- rename : toolkit/mozapps/extensions/test/unit/test_bug541420.js => toolkit/mozapps/extensions/test/xpcshell/test_bug541420.js		2010-05-11 11:09:54 -07:00
..
cmd	Bug 542460 - Remove executable permission on source files [r=ted.mielczarek]	2010-05-06 09:32:50 +02:00
coverage	Merge mozilla-central into electrolysis	2010-02-09 11:39:28 -05:00
lib	Bug 542460 - Remove executable permission on source files [r=ted.mielczarek]	2010-05-06 09:32:50 +02:00
pkg
tests	merge with m-c. resolved conflicts in:	2010-05-11 11:09:54 -07:00
Makefile
manifest.mn
trademarks.txt