gecko-dev/netwerk
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
..
base merge with m-c. resolved conflicts in: 2010-05-11 11:09:54 -07:00
build merge with m-c. 2010-04-26 23:17:51 -07:00
cache Bug 560171 - nsDiskCacheStreamIO::Write leaks mBuffer on realloc failure, r=biesi 2010-04-18 23:22:00 -07:00
cookie merge with m-c. resolved conflicts in: 2010-05-11 11:09:54 -07:00
dns Merge with m-c. no hand edits 2010-04-29 21:04:50 -07:00
ipc Followup to bug 541131: update |include protocol "PFoo.ipdl"| usages in e10s. 2010-04-27 02:12:38 -05:00
locales Bug 451909 - kill MOZ_XUL_APP now that all apps set it; files removal; r=ted.mielczarek 2008-09-20 15:54:40 +02:00
mime Bug 541334 - Add recognition of SHA-2 hashes when verifying S/MIME messages with detached signatures (application/pkcs7-signature); Patch for recognizing SHA-2 micalgs in libmime (m-c part). 2010-02-23 06:06:29 +01:00
protocol merge with m-c. resolved conflicts in: 2010-05-11 11:09:54 -07:00
socket Followup to bug 398573 - remove REQUIRES from the tree since it is no longer used... automatically generated patch, rs=ted 2009-08-25 08:59:31 -07:00
streamconv Bug 545869 - Remove small buffer #defines and use preferences. r=honza 2010-04-20 09:32:28 -07:00
system Bug 560095 - Use mozilla::services::GetObserverService(). r=biesi,dveditz,gavin,josh,jst,mrbkap,roc,sdwilsh,shaver,sicking,smontagu,surkov 2010-04-29 18:59:13 +02:00
test Bug 547051: e10s: Support local use of Set/GetOwner for HttpChannelChild. r=jduell 2010-04-21 02:02:05 -07:00
wifi Bug 560095 - Use mozilla::services::GetObserverService(). r=biesi,dveditz,gavin,josh,jst,mrbkap,roc,sdwilsh,shaver,sicking,smontagu,surkov 2010-04-29 18:59:13 +02:00
build.mk Electrolysis-plugin-only bookkeeping commit. 2009-12-15 20:33:05 -05:00
confvars.sh Bug 553169: Implement InstallTrigger, the XPI content handler and confirmation for web triggered installs. r=robstrong, r=dveditz 2010-04-29 13:11:23 -07:00
Makefile.in Electrolysis-plugin-only bookkeeping commit. 2009-12-15 20:33:05 -05:00
necko-config.h.in Bug 545869 - Remove small buffer #defines and use preferences. r=honza 2010-04-20 09:32:28 -07:00