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	Bug 504080: Update NSS from NSS_3_12_4_FIPS1_WITH_CKBI_1_75 to	2009-07-28 17:01:39 -07:00
tests	merge with m-c. resolved conflicts in:	2010-05-11 11:09:54 -07:00
Makefile	Bug 473837, land NSS_3_12_3_BETA2	2009-01-21 04:43:31 +01:00
manifest.mn	Import NSS_3_12_RC4	2008-06-06 08:40:11 -04:00
trademarks.txt	Bug 487712, Pick up NSS_HEAD_20090409 to fix WINCE	2009-04-10 02:00:56 +02:00