gecko-dev/security
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
..
coreconf Bug 527659, Update Mozilla-central to NSS 3.12.6 2010-02-12 09:47:51 +01:00
dbm Bug 486182, Land NSS 3.12.3 final in mozilla-central 2009-04-07 03:36:45 +02:00
manager merge with m-c. resolved conflicts in: 2010-05-11 11:09:54 -07:00
nss merge with m-c. resolved conflicts in: 2010-05-11 11:09:54 -07:00
patches Bug 527659, Update Mozilla-central to NSS 3.12.6 RTM (RC2) 2010-03-05 14:44:10 +01:00